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.312 by root, Fri Jun 23 23:54:30 2006 UTC vs.
Revision 1.399 by root, Sat Jul 21 16:07:53 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) = @_;
424		462
425	return if $FOCUS == $self;	463	return if $FOCUS == $self;
426	return unless $self->{can_focus};	464	return unless $self->{can_focus};
427		465
428	my $focus = $FOCUS; $FOCUS = $self;	466	$FOCUS = $self;
429		467
430	$focus->update if $focus;	468	$self->update;
431	$FOCUS->update;
432		469
433	0	470	0
434	}	471	}
435		472
436	sub invoke_focus_out {	473	sub invoke_focus_out {
437	my ($self) = @_;	474	my ($self) = @_;
438		475
439	return unless $FOCUS == $self;	476	return unless $FOCUS == $self;
440		477
441	my $focus = $FOCUS; undef $FOCUS;	478	undef $FOCUS;
442		479
443	$focus->update if $focus; #?	480	$self->update;
444		481
445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	482	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	483	unless $FOCUS;
447		484
448	0	485	0
449	}	486	}
450		487
451	sub grab_focus {	488	sub grab_focus {
452	my ($self) = @_;	489	my ($self) = @_;
453		490
		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	}
…		…
584	my ($self) = @_;	646	my ($self) = @_;
585		647
586	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
587	}	649	}
588		650
		651	my $cntx;#d#
589	sub DESTROY {	652	sub DESTROY {
590	my ($self) = @_;	653	my ($self) = @_;
591		654
592	delete $WIDGET{$self+0};	655	return if CFPlus::in_destruct;
593		656
594	eval { $self->destroy };	657	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
		660	delete $WIDGET{$self+0};
596	}	661	}
597		662
598	#############################################################################	663	#############################################################################
599		664
600	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
601		666
602	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
603		668
604	use strict;	669	use strict;
605	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
606		671
607	sub new {	672	sub new {
608	my $class = shift;	673	my $class = shift;
609		674
610	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
641	}	706	}
642	}	707	}
643		708
644	#############################################################################	709	#############################################################################
645		710
646	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
647		712
648	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
649		714
650	sub new {	715	sub new {
651	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
653	}	718	}
…		…
660		725
661	sub draw { }	726	sub draw { }
662		727
663	#############################################################################	728	#############################################################################
664		729
665	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
666		731
667	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
668		733
669	sub new {	734	sub new {
670	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
671		736
672	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
676	can_events => 0,	741	can_events => 0,
677	%arg,	742	%arg,
678	);	743	);
679		744
680	$self->add (@$children)	745	$self->add (@$children)
681	if $children;	746	if $children && @$children;
682		747
683	$self	748	$self
		749	}
		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
684	}	757	}
685		758
686	sub add {	759	sub add {
687	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
688		761
689	$_->set_parent ($self)	762	$_->set_parent ($self)
690	for @widgets;	763	for @widgets;
691		764
		765	# TODO: only do this in widgets that need it, e.g. root, fixed
692	use sort 'stable';	766	use sort 'stable';
693		767
694	$self->{children} = [	768	$self->{children} = [
695	sort { $a->{z} <=> $b->{z} }	769	sort { $a->{z} <=> $b->{z} }
696	@{$self->{children}}, @widgets	770	@{$self->{children}}, @widgets
697	];	771	];
698		772
699	$self->realloc;	773	$self->realloc;
		774
		775	map $_+0, @widgets
700	}	776	}
701		777
702	sub children {	778	sub children {
703	@{ $_[0]{children} }	779	@{ $_[0]{children} }
704	}	780	}
…		…
715	}	791	}
716		792
717	sub clear {	793	sub clear {
718	my ($self) = @_;	794	my ($self) = @_;
719		795
720	my $children = delete $self->{children};	796	my $children = $self->{children};
721	$self->{children} = [];	797	$self->{children} = [];
722		798
723	for (@$children) {	799	for (@$children) {
724	delete $_->{parent};	800	delete $_->{parent};
725	$_->hide;	801	$_->hide;
…		…
750	$_->draw for @{$self->{children}};	826	$_->draw for @{$self->{children}};
751	}	827	}
752		828
753	#############################################################################	829	#############################################################################
754		830
755	package CFClient::UI::Bin;	831	package CFPlus::UI::Bin;
756		832
757	our @ISA = CFClient::UI::Container::;	833	our @ISA = CFPlus::UI::Container::;
758		834
759	sub new {	835	sub new {
760	my ($class, %arg) = @_;	836	my ($class, %arg) = @_;
761		837
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	838	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		839
764	$class->SUPER::new (children => [$child], %arg)	840	$class->SUPER::new (children => [$child], %arg)
765	}	841	}
766		842
767	sub add {	843	sub add {
…		…
774	sub remove {	850	sub remove {
775	my ($self, $widget) = @_;	851	my ($self, $widget) = @_;
776		852
777	$self->SUPER::remove ($widget);	853	$self->SUPER::remove ($widget);
778		854
779	$self->{children} = [new CFClient::UI::Empty]	855	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	856	unless @{$self->{children}};
781	}	857	}
782		858
783	sub child { $_[0]->{children}[0] }	859	sub child { $_[0]->{children}[0] }
784		860
…		…
796		872
797	#############################################################################	873	#############################################################################
798		874
799	# back-buffered drawing area	875	# back-buffered drawing area
800		876
801	package CFClient::UI::Window;	877	package CFPlus::UI::Window;
802		878
803	our @ISA = CFClient::UI::Bin::;	879	our @ISA = CFPlus::UI::Bin::;
804		880
805	use CFClient::OpenGL;	881	use CFPlus::OpenGL;
806		882
807	sub new {	883	sub new {
808	my ($class, %arg) = @_;	884	my ($class, %arg) = @_;
809		885
810	my $self = $class->SUPER::new (%arg);	886	my $self = $class->SUPER::new (%arg);
…		…
832	}	908	}
833		909
834	sub render_child {	910	sub render_child {
835	my ($self) = @_;	911	my ($self) = @_;
836		912
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	913	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	914	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	915	glClear GL_COLOR_BUFFER_BIT;
840		916
841	{	917	{
842	package CFClient::UI::Base;	918	package CFPlus::UI::Base;
843		919
844	($draw_x, $draw_y, $draw_w, $draw_h) =	920	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	921	(0, 0, $self->{w}, $self->{h});
		922
		923	$self->_render;
846	}	924	}
847
848	$self->_render;
849	};	925	};
850	}	926	}
851		927
852	sub _draw {	928	sub _draw {
853	my ($self) = @_;	929	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		930
857	my $tex = $self->{texture}	931	my $tex = $self->{texture}
858	or return;	932	or return;
859		933
860	glEnable GL_TEXTURE_2D;	934	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	935	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	936	glColor 0, 0, 0, 1;
863		937
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	938	$tex->draw_quad_alpha_premultiplied (0, 0);
865		939
866	glDisable GL_TEXTURE_2D;	940	glDisable GL_TEXTURE_2D;
867	}	941	}
868		942
869	#############################################################################	943	#############################################################################
870		944
871	package CFClient::UI::ViewPort;	945	package CFPlus::UI::ViewPort;
872		946
		947	use List::Util qw(min max);
		948
873	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
874		950
875	sub new {	951	sub new {
876	my $class = shift;	952	my $class = shift;
877		953
878	$class->SUPER::new (	954	$class->SUPER::new (
…		…
885	sub size_request {	961	sub size_request {
886	my ($self) = @_;	962	my ($self) = @_;
887		963
888	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	964	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889		965
890	$w = 10 if $self->{scroll_x};	966	$w = 1 if $self->{scroll_x};
891	$h = 10 if $self->{scroll_y};	967	$h = 1 if $self->{scroll_y};
892		968
893	($w, $h)	969	($w, $h)
894	}	970	}
895		971
896	sub invoke_size_allocate {	972	sub invoke_size_allocate {
…		…
908	}	984	}
909		985
910	sub set_offset {	986	sub set_offset {
911	my ($self, $x, $y) = @_;	987	my ($self, $x, $y) = @_;
912		988
		989	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		990	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		991
		992	if ($x != $self->{view_x} or $y != $self->{view_y}) {
913	$self->{view_x} = int $x;	993	$self->{view_x} = $x;
914	$self->{view_y} = int $y;	994	$self->{view_y} = $y;
915		995
		996	$self->emit (changed => $x, $y);
916	$self->update;	997	$self->update;
		998	}
917	}	999	}
918		1000
919	# hmm, this does not work for topleft of $self... but we should not ask for that	1001	# hmm, this does not work for topleft of $self... but we should not ask for that
920	sub coord2local {	1002	sub coord2local {
921	my ($self, $x, $y) = @_;	1003	my ($self, $x, $y) = @_;
…		…
936	my ($self, $x, $y) = @_;	1018	my ($self, $x, $y) = @_;
937		1019
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1020	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1021	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1022	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1023	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1024	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1025	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1026	}
945	}	1027	}
946		1028
947	sub _render {	1029	sub _render {
948	my ($self) = @_;	1030	my ($self) = @_;
949		1031
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1032	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};	1033	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1034
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1035	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1036
955	$self->SUPER::_render;	1037	$self->SUPER::_render;
956	}	1038	}
957		1039
958	#############################################################################	1040	#############################################################################
959		1041
960	package CFClient::UI::ScrolledWindow;	1042	package CFPlus::UI::ScrolledWindow;
961		1043
962	our @ISA = CFClient::UI::HBox::;	1044	our @ISA = CFPlus::UI::Table::;
963		1045
964	sub new {	1046	sub new {
965	my ($class, %arg) = @_;	1047	my ($class, %arg) = @_;
966		1048
967	my $child = delete $arg{child};	1049	my $child = delete $arg{child};
968		1050
969	my $self;	1051	my $self;
970		1052
971	my $slider = new CFClient::UI::Slider	1053	my $hslider = new CFPlus::UI::Slider
		1054	col => 0,
		1055	row => 1,
		1056	vertical => 0,
		1057	range => [0, 0, 1, 0.01], # HACK fix
		1058	on_changed => sub {
		1059	$self->{hpos} = $_[1];
		1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1061	},
		1062	;
		1063
		1064	my $vslider = new CFPlus::UI::Slider
		1065	col => 1,
		1066	row => 0,
972	vertical => 1,	1067	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1068	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1069	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1070	$self->{vpos} = $_[1];
		1071	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1072	},
977	;	1073	;
978		1074
979	$self = $class->SUPER::new (	1075	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1076	scroll_x => 0,
		1077	scroll_y => 1,
		1078	can_events => 1,
981	slider => $slider,	1079	hslider => $hslider,
		1080	vslider => $vslider,
		1081	col_expand => [1, 0],
		1082	row_expand => [1, 0],
982	%arg,	1083	%arg,
983	);	1084	);
984		1085
		1086	$self->{vp} = new CFPlus::UI::ViewPort
		1087	col => 0,
		1088	row => 0,
		1089	expand => 1,
		1090	scroll_x => $self->{scroll_x},
		1091	scroll_y => $self->{scroll_y},
		1092	on_changed => sub {
		1093	my ($vp, $x, $y) = @_;
		1094
		1095	$vp->{parent}{hslider}->set_value ($x);
		1096	$vp->{parent}{vslider}->set_value ($y);
		1097
		1098	0
		1099	},
		1100	;
		1101
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1102	$self->SUPER::add ($self->{vp});
		1103
986	$self->add ($child) if $child;	1104	$self->add ($child) if $child;
987		1105
988	$self	1106	$self
989	}	1107	}
990		1108
…		…
992	my ($self, $widget) = @_;	1110	my ($self, $widget) = @_;
993		1111
994	$self->{vp}->add ($self->{child} = $widget);	1112	$self->{vp}->add ($self->{child} = $widget);
995	}	1113	}
996		1114
997	sub update {	1115	sub update_slider {
		1116	my ($self) = @_;
		1117
		1118	my $child = ($self->{vp} or return)->child;
		1119
		1120	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1121	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1122
		1123	my $visible = $w1 > $w2;
		1124	if ($visible != $self->{hslider_visible}) {
		1125	$self->{hslider_visible} = $visible;
		1126	$visible ? $self->SUPER::add ($self->{hslider})
		1127	: $self->SUPER::remove ($self->{hslider});
		1128	}
		1129
		1130	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1131	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1132
		1133	my $visible = $h1 > $h2;
		1134	if ($visible != $self->{vslider_visible}) {
		1135	$self->{vslider_visible} = $visible;
		1136	$visible ? $self->SUPER::add ($self->{vslider})
		1137	: $self->SUPER::remove ($self->{vslider});
		1138	}
		1139	}
		1140
		1141	sub start_dragging {
998	my ($self) = @_;	1142	my ($self, $ev) = @_;
999		1143
1000	$self->SUPER::update;	1144	$self->grab_focus;
1001		1145
1002	# todo: overwrite size_allocate of child	1146	my $ox = $self->{vp}{view_x};
1003	my $child = $self->{vp}->child;	1147	my $oy = $self->{vp}{view_y};
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1148
		1149	$self->{motion} = sub {
		1150	my ($ev, $x, $y) = @_;
		1151
		1152	$ox -= $ev->{xrel};
		1153	$oy -= $ev->{yrel};
		1154
		1155	$self->{vp}->set_offset ($ox, $oy);
		1156	};
		1157	}
		1158
		1159	sub invoke_mouse_wheel {
		1160	my ($self, $ev) = @_;
		1161
		1162	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1163	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1164
		1165	1
		1166	}
		1167
		1168	sub invoke_button_down {
		1169	my ($self, $ev, $x, $y) = @_;
		1170
		1171	if ($ev->{button} == 2) {
		1172	$self->start_dragging ($ev);
		1173	return 1;
		1174	}
		1175
		1176	0
		1177	}
		1178
		1179	sub invoke_button_up {
		1180	my ($self, $ev, $x, $y) = @_;
		1181
		1182	if (delete $self->{motion}) {
		1183	return 1;
		1184	}
		1185
		1186	0
		1187	}
		1188
		1189	sub invoke_mouse_motion {
		1190	my ($self, $ev, $x, $y) = @_;
		1191
		1192	if ($self->{motion}) {
		1193	$self->{motion}->($ev, $x, $y);
		1194	return 1;
		1195	}
		1196
		1197	0
1005	}	1198	}
1006		1199
1007	sub invoke_size_allocate {	1200	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1201	my ($self, $w, $h) = @_;
1009		1202
1010	my $child = $self->{vp}->child;	1203	$self->update_slider;
1011	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013	$self->SUPER::invoke_size_allocate ($w, $h)	1204	$self->SUPER::invoke_size_allocate ($w, $h)
1014	}	1205	}
1015		1206
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018
1019	#############################################################################	1207	#############################################################################
1020		1208
1021	package CFClient::UI::Frame;	1209	package CFPlus::UI::Frame;
1022		1210
1023	our @ISA = CFClient::UI::Bin::;	1211	our @ISA = CFPlus::UI::Bin::;
1024		1212
1025	use CFClient::OpenGL;	1213	use CFPlus::OpenGL;
1026		1214
1027	sub new {	1215	sub new {
1028	my $class = shift;	1216	my $class = shift;
1029		1217
1030	$class->SUPER::new (	1218	$class->SUPER::new (
…		…
1056	$self->SUPER::_draw;	1244	$self->SUPER::_draw;
1057	}	1245	}
1058		1246
1059	#############################################################################	1247	#############################################################################
1060		1248
1061	package CFClient::UI::FancyFrame;	1249	package CFPlus::UI::FancyFrame;
1062		1250
1063	our @ISA = CFClient::UI::Bin::;	1251	our @ISA = CFPlus::UI::Bin::;
1064		1252
1065	use CFClient::OpenGL;	1253	use CFPlus::OpenGL;
		1254
		1255	sub new {
		1256	my ($class, %arg) = @_;
		1257
		1258	if ((exists $arg{label}) && !ref $arg{label}) {
		1259	$arg{label} = new CFPlus::UI::Label
		1260	align => 1,
		1261	valign => 0,
		1262	text => $arg{label},
		1263	fontsize => ($arg{border} || 0.8) * 0.75;
		1264	}
		1265
		1266	my $self = $class->SUPER::new (
		1267	# label => "",
		1268	fg => [0.6, 0.3, 0.1],
		1269	border => 0.8,
		1270	style => 'single',
		1271	%arg,
		1272	);
		1273
		1274	$self
		1275	}
		1276
		1277	sub add {
		1278	my ($self, @widgets) = @_;
		1279
		1280	$self->SUPER::add (@widgets);
		1281	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1282	}
		1283
		1284	sub border {
		1285	int $_[0]{border} * $::FONTSIZE
		1286	}
		1287
		1288	sub size_request {
		1289	my ($self) = @_;
		1290
		1291	($self->{label_w}, undef) = $self->{label}->size_request
		1292	if $self->{label};
		1293
		1294	my ($w, $h) = $self->SUPER::size_request;
		1295
		1296	(
		1297	$w + $self->border * 2,
		1298	$h + $self->border * 2,
		1299	)
		1300	}
		1301
		1302	sub invoke_size_allocate {
		1303	my ($self, $w, $h) = @_;
		1304
		1305	my $border = $self->border;
		1306
		1307	$w -= List::Util::max 0, $border * 2;
		1308	$h -= List::Util::max 0, $border * 2;
		1309
		1310	if (my $label = $self->{label}) {
		1311	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1312	$label->{h} = List::Util::min $h, $border;
		1313	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1314	}
		1315
		1316	$self->child->configure ($border, $border, $w, $h);
		1317
		1318	1
		1319	}
		1320
		1321	sub _draw {
		1322	my ($self) = @_;
		1323
		1324	my $child = $self->{children}[0];
		1325
		1326	my $border = $self->border;
		1327	my ($w, $h) = ($self->{w}, $self->{h});
		1328
		1329	$child->draw;
		1330
		1331	glColor @{$self->{fg}};
		1332	glBegin GL_LINE_STRIP;
		1333	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1334	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1335	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1336	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1337	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1338	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1339	glEnd;
		1340
		1341	if ($self->{label}) {
		1342	glTranslate $border * 2, 0;
		1343	$self->{label}->_draw;
		1344	}
		1345	}
		1346
		1347	#############################################################################
		1348
		1349	package CFPlus::UI::Toplevel;
		1350
		1351	our @ISA = CFPlus::UI::Bin::;
		1352
		1353	use CFPlus::OpenGL;
1066		1354
1067	my $bg =	1355	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1356	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1357	mipmap => 1, wrap => 1;
1070		1358
1071	my @border =	1359	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1360	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1361	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1362
		1363	my @icon =
		1364	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1365	qw(x1_move.png x1_resize.png);
1074		1366
1075	sub new {	1367	sub new {
1076	my ($class, %arg) = @_;	1368	my ($class, %arg) = @_;
1077		1369
1078	my $self = $class->SUPER::new (	1370	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1371	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1372	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1373	border => 0.6,
1082	can_events => 1,	1374	can_events => 1,
1083	min_w => 16,	1375	min_w => 64,
1084	min_h => 16,	1376	min_h => 32,
1085	%arg,	1377	%arg,
1086	);	1378	);
1087		1379
1088	$self->{title_widget} = new CFClient::UI::Label	1380	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1381	align => 0,
1090	valign => 1,	1382	valign => 1,
1091	text => $self->{title},	1383	text => $self->{title},
1092	fontsize => $self->{border},	1384	fontsize => $self->{border},
1093	if exists $self->{title};	1385	if exists $self->{title};
1094		1386
1095	if ($self->{has_close_button}) {	1387	if ($self->{has_close_button}) {
1096	$self->{close_button} =	1388	$self->{close_button} =
1097	new CFClient::UI::ImageButton	1389	new CFPlus::UI::ImageButton
1098	path => 'x1_close.png',	1390	path => 'x1_close.png',
1099	on_activate => sub { $self->hide };	1391	on_activate => sub { $self->emit ("delete") };
1100		1392
1101	$self->CFClient::UI::Container::add ($self->{close_button});	1393	$self->CFPlus::UI::Container::add ($self->{close_button});
1102	}	1394	}
1103		1395
1104	$self	1396	$self
1105	}	1397	}
1106		1398
1107	sub add {	1399	sub add {
1108	my ($self, @widgets) = @_;	1400	my ($self, @widgets) = @_;
1109		1401
1110	$self->SUPER::add (@widgets);	1402	$self->SUPER::add (@widgets);
1111	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1403	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1404	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113	}	1405	}
1114		1406
1115	sub border {	1407	sub border {
1116	int $_[0]{border} * $::FONTSIZE	1408	int $_[0]{border} * $::FONTSIZE
1117	}	1409	}
…		…
1150	$self->child->configure ($border, $border, $w, $h);	1442	$self->child->configure ($border, $border, $w, $h);
1151		1443
1152	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1444	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153	if $self->{close_button};	1445	if $self->{close_button};
1154		1446
		1447	1
		1448	}
		1449
		1450	sub invoke_delete {
		1451	my ($self) = @_;
		1452
		1453	$self->hide;
		1454
1155	1	1455	1
1156	}	1456	}
1157		1457
1158	sub invoke_button_down {	1458	sub invoke_button_down {
1159	my ($self, $ev, $x, $y) = @_;	1459	my ($self, $ev, $x, $y) = @_;
…		…
1217	$self->{motion}->($ev, $x, $y) if $self->{motion};	1517	$self->{motion}->($ev, $x, $y) if $self->{motion};
1218		1518
1219	! ! $self->{motion}	1519	! ! $self->{motion}
1220	}	1520	}
1221		1521
		1522	sub invoke_visibility_change {
		1523	my ($self, $visible) = @_;
		1524
		1525	delete $self->{motion} unless $visible;
		1526
		1527	0
		1528	}
		1529
1222	sub _draw {	1530	sub _draw {
1223	my ($self) = @_;	1531	my ($self) = @_;
1224		1532
1225	my $child = $self->{children}[0];	1533	my $child = $self->{children}[0];
1226		1534
…		…
1231	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1539	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1232		1540
1233	my $border = $self->border;	1541	my $border = $self->border;
1234		1542
1235	glColor @{ $self->{border_bg} };	1543	glColor @{ $self->{border_bg} };
1236	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1544	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1237	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1545	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1238	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1546	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1239	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1547	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1548
		1549	# move
		1550	my $w2 = ($w - $border) * .5;
		1551	my $h2 = ($h - $border) * .5;
		1552	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1553	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1554	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1555
		1556	# resize
		1557	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1558	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1559	unless $self->{has_close_button};
		1560	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1561	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1240		1562
1241	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1563	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1242	glColor @{ $self->{bg} };	1564	glColor @{ $self->{bg} };
1243		1565
1244	# TODO: repeat texture not scale	1566	# TODO: repeat texture not scale
…		…
1263	if $self->{close_button};	1585	if $self->{close_button};
1264	}	1586	}
1265		1587
1266	#############################################################################	1588	#############################################################################
1267		1589
1268	package CFClient::UI::Table;	1590	package CFPlus::UI::Table;
1269		1591
1270	our @ISA = CFClient::UI::Base::;	1592	our @ISA = CFPlus::UI::Container::;
1271		1593
1272	use List::Util qw(max sum);	1594	use List::Util qw(max sum);
1273		1595
1274	use CFClient::OpenGL;	1596	use CFPlus::OpenGL;
1275		1597
1276	sub new {	1598	sub new {
1277	my $class = shift;	1599	my $class = shift;
1278		1600
1279	$class->SUPER::new (	1601	$class->SUPER::new (
1280	col_expand => [],	1602	col_expand => [],
		1603	row_expand => [],
1281	@_,	1604	@_,
1282	)	1605	)
1283	}	1606	}
1284		1607
1285	sub children {
1286	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287	}
1288
1289	sub add {	1608	sub add {
1290	my ($self, $x, $y, $child) = @_;	1609	my ($self, @widgets) = @_;
1291		1610
1292	$child->set_parent ($self);	1611	for my $child (@widgets) {
1293	$self->{children}[$y][$x] = $child;	1612	$child->{rowspan} ||= 1;
		1613	$child->{colspan} ||= 1;
		1614	}
1294		1615
1295	$self->realloc;	1616	$self->SUPER::add (@widgets);
1296	}	1617	}
1297		1618
1298	sub remove {	1619	sub add_at {
		1620	my $self = shift;
		1621
		1622	my @widgets;
		1623
		1624	while (@_) {
		1625	my ($col, $row, $child) = splice @_, 0, 3, ();
		1626
		1627	$child->{row} = $row;
		1628	$child->{col} = $col;
		1629
		1630	push @widgets, $child;
		1631	}
		1632
		1633	$self->add (@widgets);
		1634	}
		1635
		1636	sub get_wh {
1299	my ($self, $child) = @_;	1637	my ($self) = @_;
1300		1638
1301	# TODO: not yet implemented	1639	my (@w, @h);
1302	}
1303
1304	# TODO: move to container class maybe? send children a signal on removal?
1305	sub clear {
1306	my ($self) = @_;
1307		1640
1308	my @children = $self->children;	1641	my @children = $self->children;
1309	delete $self->{children};	1642
		1643	# first pass, columns
		1644	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1645	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1646
		1647	my $sw = sum @w[$c .. $c + $cs - 1];
		1648
		1649	if ($w > $sw) {
		1650	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1651	}
1310		1652	}
1311	for (@children) {
1312	delete $_->{parent};
1313	$_->hide;
1314	}
1315		1653
1316	$self->realloc;	1654	# second pass, rows
1317	}	1655	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1318
1319	sub get_wh {
1320	my ($self) = @_;
1321
1322	my (@w, @h);
1323
1324	for my $y (0 .. $#{$self->{children}}) {
1325	my $row = $self->{children}[$y]
1326	or next;
1327
1328	for my $x (0 .. $#$row) {
1329	my $widget = $row->[$x]
1330	or next;
1331	my ($w, $h) = @$widget{qw(req_w req_h)};	1656	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1332		1657
1333	$w[$x] = max $w[$x], $w;	1658	my $sh = sum @h[$r .. $r + $rs - 1];
1334	$h[$y] = max $h[$y], $h;	1659
		1660	if ($h > $sh) {
		1661	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1335	}	1662	}
1336	}	1663	}
1337		1664
1338	(\@w, \@h)	1665	(\@w, \@h)
1339	}	1666	}
…		…
1355	my ($ws, $hs) = $self->get_wh;	1682	my ($ws, $hs) = $self->get_wh;
1356		1683
1357	my $req_w = (sum @$ws) || 1;	1684	my $req_w = (sum @$ws) || 1;
1358	my $req_h = (sum @$hs) || 1;	1685	my $req_h = (sum @$hs) || 1;
1359		1686
1360	# TODO: nicer code && do row_expand	1687	# now linearly scale the rows/columns to the allocated size
1361	my @col_expand = @{$self->{col_expand}};	1688	my @col_expand = @{$self->{col_expand}};
1362	@col_expand = (1) x @$ws unless @col_expand;	1689	@col_expand = (1) x @$ws unless @col_expand;
1363	my $col_expand = (sum @col_expand) || 1;	1690	my $col_expand = (sum @col_expand) || 1;
1364		1691
1365	# linearly scale sizes
1366	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1692	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368		1693
1369	CFClient::UI::harmonize $ws;	1694	CFPlus::UI::harmonize $ws;
		1695
		1696	my @row_expand = @{$self->{row_expand}};
		1697	@row_expand = (1) x @$ws unless @row_expand;
		1698	my $row_expand = (sum @row_expand) || 1;
		1699
		1700	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1701
1370	CFClient::UI::harmonize $hs;	1702	CFPlus::UI::harmonize $hs;
1371		1703
1372	my $y;	1704	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1705	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1373		1706
1374	for my $r (0 .. $#{$self->{children}}) {	1707	for my $widget ($self->children) {
1375	my $row = $self->{children}[$r]	1708	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1376	or next;
1377		1709
1378	my $x = 0;	1710	$widget->configure (
1379	my $row_h = $hs->[$r];	1711	$x[$c], $y[$r],
		1712	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1380		1713	);
1381	for my $c (0 .. $#$row) {	1714	}
1382	my $col_w = $ws->[$c];
1383		1715
1384	if (my $widget = $row->[$c]) {	1716	1
1385	$widget->configure ($x, $y, $col_w, $row_h);	1717	}
1386	}
1387		1718
1388	$x += $col_w;	1719	#############################################################################
		1720
		1721	package CFPlus::UI::Fixed;
		1722
		1723	use List::Util qw(min max);
		1724
		1725	our @ISA = CFPlus::UI::Container::;
		1726
		1727	sub add {
		1728	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1729
		1730	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1731	$self->SUPER::add ($child);
		1732	}
		1733
		1734	sub _scale($$$) {
		1735	my ($mode, $val, $max) = @_;
		1736
		1737	$mode eq "abs" ? $val
		1738	: $mode eq "rel" ? $val * $max
		1739	: 0
		1740	}
		1741
		1742	sub size_request {
		1743	my ($self) = @_;
		1744
		1745	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1746
		1747	# determine overall size by querying abs widgets
		1748	for my $child ($self->visible_children) {
		1749	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1750
		1751	if ($pos eq "abs") {
		1752	$w = _scale $size, $w, $child->{req_w};
		1753	$h = _scale $size, $h, $child->{req_h};
		1754
		1755	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1756	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1389	}	1757	}
		1758	}
1390		1759
1391	$y += $row_h;	1760	my $W = $x2 - $x1;
		1761	my $H = $y2 - $y1;
		1762
		1763	# now layout remaining widgets
		1764	for my $child ($self->visible_children) {
		1765	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1766
		1767	if ($pos ne "abs") {
		1768	$x = _scale $pos, $x, $W;
		1769	$y = _scale $pos, $x, $H;
		1770	$w = _scale $size, $w, $child->{req_w};
		1771	$h = _scale $size, $h, $child->{req_h};
		1772
		1773	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1774	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1775	}
		1776	}
		1777
		1778	my $W = $x2 - $x1;
		1779	my $H = $y2 - $y1;
		1780
		1781	($W, $H)
		1782	}
		1783
		1784	sub invoke_size_allocate {
		1785	my ($self, $W, $H) = @_;
		1786
		1787	for my $child ($self->visible_children) {
		1788	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1789
		1790	$x = _scale $pos, $x, $W;
		1791	$y = _scale $pos, $x, $H;
		1792	$w = _scale $size, $w, $child->{req_w};
		1793	$h = _scale $size, $h, $child->{req_h};
		1794
		1795	$child->configure ($x, $y, $w, $h);
1392	}	1796	}
1393		1797
1394	1	1798	1
1395	}	1799	}
1396		1800
1397	sub find_widget {
1398	my ($self, $x, $y) = @_;
1399
1400	$x -= $self->{x};
1401	$y -= $self->{y};
1402
1403	my $res;
1404
1405	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1406	$res = $_->find_widget ($x, $y)
1407	and return $res;
1408	}
1409
1410	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1411	}
1412
1413	sub _draw {
1414	my ($self) = @_;
1415
1416	for (grep $_, @{$self->{children}}) {
1417	$_->draw for grep $_, @$_;
1418	}
1419	}
1420
1421	#############################################################################	1801	#############################################################################
1422		1802
1423	package CFClient::UI::Box;	1803	package CFPlus::UI::Box;
1424		1804
1425	our @ISA = CFClient::UI::Container::;	1805	our @ISA = CFPlus::UI::Container::;
1426		1806
1427	sub size_request {	1807	sub size_request {
1428	my ($self) = @_;	1808	my ($self) = @_;
1429		1809
1430	$self->{vertical}	1810	$self->{vertical}
…		…
1463	$req[$_] += $space * $children[$_]{expand}	1843	$req[$_] += $space * $children[$_]{expand}
1464	for 0 .. $#children;	1844	for 0 .. $#children;
1465	}	1845	}
1466	}	1846	}
1467		1847
1468	CFClient::UI::harmonize \@req;	1848	CFPlus::UI::harmonize \@req;
1469		1849
1470	my $pos = 0;	1850	my $pos = 0;
1471	for (0 .. $#children) {	1851	for (0 .. $#children) {
1472	my $alloc = $req[$_];	1852	my $alloc = $req[$_];
1473	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1853	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1478	1	1858	1
1479	}	1859	}
1480		1860
1481	#############################################################################	1861	#############################################################################
1482		1862
1483	package CFClient::UI::HBox;	1863	package CFPlus::UI::HBox;
1484		1864
1485	our @ISA = CFClient::UI::Box::;	1865	our @ISA = CFPlus::UI::Box::;
1486		1866
1487	sub new {	1867	sub new {
1488	my $class = shift;	1868	my $class = shift;
1489		1869
1490	$class->SUPER::new (	1870	$class->SUPER::new (
…		…
1493	)	1873	)
1494	}	1874	}
1495		1875
1496	#############################################################################	1876	#############################################################################
1497		1877
1498	package CFClient::UI::VBox;	1878	package CFPlus::UI::VBox;
1499		1879
1500	our @ISA = CFClient::UI::Box::;	1880	our @ISA = CFPlus::UI::Box::;
1501		1881
1502	sub new {	1882	sub new {
1503	my $class = shift;	1883	my $class = shift;
1504		1884
1505	$class->SUPER::new (	1885	$class->SUPER::new (
…		…
1508	)	1888	)
1509	}	1889	}
1510		1890
1511	#############################################################################	1891	#############################################################################
1512		1892
1513	package CFClient::UI::Label;	1893	package CFPlus::UI::Label;
1514		1894
1515	our @ISA = CFClient::UI::DrawBG::;	1895	our @ISA = CFPlus::UI::DrawBG::;
1516		1896
1517	use CFClient::OpenGL;	1897	use CFPlus::OpenGL;
1518		1898
1519	sub new {	1899	sub new {
1520	my ($class, %arg) = @_;	1900	my ($class, %arg) = @_;
1521		1901
1522	my $self = $class->SUPER::new (	1902	my $self = $class->SUPER::new (
…		…
1525	#active_bg => none	1905	#active_bg => none
1526	#font => default_font	1906	#font => default_font
1527	#text => initial text	1907	#text => initial text
1528	#markup => initial narkup	1908	#markup => initial narkup
1529	#max_w => maximum pixel width	1909	#max_w => maximum pixel width
		1910	#style => 0, # render flags
1530	ellipsise => 3, # end	1911	ellipsise => 3, # end
1531	layout => (new CFClient::Layout),	1912	layout => (new CFPlus::Layout),
1532	fontsize => 1,	1913	fontsize => 1,
1533	align => -1,	1914	align => -1,
1534	valign => -1,	1915	valign => -1,
1535	padding_x => 2,	1916	padding_x => 2,
1536	padding_y => 2,	1917	padding_y => 2,
1537	can_events => 0,	1918	can_events => 0,
1538	%arg	1919	%arg
1539	);	1920	);
1540		1921
1541	if (exists $self->{template}) {	1922	if (exists $self->{template}) {
1542	my $layout = new CFClient::Layout;	1923	my $layout = new CFPlus::Layout;
1543	$layout->set_text (delete $self->{template});	1924	$layout->set_text (delete $self->{template});
1544	$self->{template} = $layout;	1925	$self->{template} = $layout;
1545	}	1926	}
1546		1927
1547	if (exists $self->{markup}) {	1928	if (exists $self->{markup}) {
…		…
1551	}	1932	}
1552		1933
1553	$self	1934	$self
1554	}	1935	}
1555		1936
1556	sub escape($) {
1557	local $_ = $_[0];
1558
1559	s/&/&amp;/g;
1560	s/>/&gt;/g;
1561	s/</&lt;/g;
1562
1563	$_
1564	}
1565
1566	sub update {	1937	sub update {
1567	my ($self) = @_;	1938	my ($self) = @_;
1568		1939
1569	delete $self->{texture};	1940	delete $self->{texture};
1570	$self->SUPER::update;	1941	$self->SUPER::update;
…		…
1581	my ($self, $text) = @_;	1952	my ($self, $text) = @_;
1582		1953
1583	return if $self->{text} eq "T$text";	1954	return if $self->{text} eq "T$text";
1584	$self->{text} = "T$text";	1955	$self->{text} = "T$text";
1585		1956
1586	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587	$self->{layout}->set_text ($text);	1957	$self->{layout}->set_text ($text);
1588		1958
1589	delete $self->{size_req};	1959	delete $self->{size_req};
1590	$self->realloc;	1960	$self->realloc;
1591	$self->update;	1961	$self->update;
…		…
1597	return if $self->{text} eq "M$markup";	1967	return if $self->{text} eq "M$markup";
1598	$self->{text} = "M$markup";	1968	$self->{text} = "M$markup";
1599		1969
1600	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1970	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601		1971
1602	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603	$self->{layout}->set_markup ($markup);	1972	$self->{layout}->set_markup ($markup);
1604		1973
1605	delete $self->{size_req};	1974	delete $self->{size_req};
1606	$self->realloc;	1975	$self->realloc;
1607	$self->update;	1976	$self->update;
…		…
1619		1988
1620	my ($w, $h) = $self->{layout}->size;	1989	my ($w, $h) = $self->{layout}->size;
1621		1990
1622	if (exists $self->{template}) {	1991	if (exists $self->{template}) {
1623	$self->{template}->set_font ($self->{font}) if $self->{font};	1992	$self->{template}->set_font ($self->{font}) if $self->{font};
		1993	$self->{template}->set_width ($self->{max_w} || -1);
1624	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1994	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625		1995
1626	my ($w2, $h2) = $self->{template}->size;	1996	my ($w2, $h2) = $self->{template}->size;
1627		1997
1628	$w = List::Util::max $w, $w2;	1998	$w = List::Util::max $w, $w2;
…		…
1652		2022
1653	sub set_fontsize {	2023	sub set_fontsize {
1654	my ($self, $fontsize) = @_;	2024	my ($self, $fontsize) = @_;
1655		2025
1656	$self->{fontsize} = $fontsize;	2026	$self->{fontsize} = $fontsize;
		2027	delete $self->{size_req};
1657	delete $self->{texture};	2028	delete $self->{texture};
1658		2029
1659	$self->realloc;	2030	$self->realloc;
1660	}	2031	}
1661		2032
1662	sub reconfigure {	2033	sub reconfigure {
1663	my ($self) = @_;	2034	my ($self) = @_;
1664		2035
1665	delete $self->{size_req};	2036	delete $self->{size_req};
		2037	delete $self->{texture};
1666		2038
1667	$self->SUPER::reconfigure;	2039	$self->SUPER::reconfigure;
1668	}	2040	}
1669		2041
1670	sub _draw {	2042	sub _draw {
1671	my ($self) = @_;	2043	my ($self) = @_;
1672		2044
1673	$self->SUPER::_draw; # draw background, if applicable	2045	$self->SUPER::_draw; # draw background, if applicable
1674		2046
1675	my $tex = $self->{texture} ||= do {	2047	my $size = $self->{texture} ||= do {
1676	$self->{layout}->set_foreground (@{$self->{fg}});	2048	$self->{layout}->set_foreground (@{$self->{fg}});
1677	$self->{layout}->set_font ($self->{font}) if $self->{font};	2049	$self->{layout}->set_font ($self->{font}) if $self->{font};
1678	$self->{layout}->set_width ($self->{w});	2050	$self->{layout}->set_width ($self->{w});
1679	$self->{layout}->set_ellipsise ($self->{ellipsise});	2051	$self->{layout}->set_ellipsise ($self->{ellipsise});
1680	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2052	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2053	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682		2054
1683	new_from_layout CFClient::Texture $self->{layout}	2055	[$self->{layout}->size]
1684	};	2056	};
1685		2057
1686	unless (exists $self->{ox}) {	2058	unless (exists $self->{ox}) {
1687	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2059	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2060	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689	: ($self->{w} - $tex->{w}) * 0.5);	2061	: ($self->{w} - $size->[0]) * 0.5);
1690		2062
1691	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2063	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2064	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693	: ($self->{h} - $tex->{h}) * 0.5);	2065	: ($self->{h} - $size->[1]) * 0.5);
1694	};	2066	};
1695		2067
1696	glEnable GL_TEXTURE_2D;
1697
1698	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2068	my $w = List::Util::min $self->{w} + 4, $size->[0];
1699	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2069	my $h = List::Util::min $self->{h} + 2, $size->[1];
1700		2070
1701	if ($tex->{format} == GL_ALPHA) {	2071	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1702	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703	glColor @{$self->{fg}};
1704	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705	} else {
1706	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1707	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1708	}
1709
1710	glDisable GL_TEXTURE_2D;
1711	}	2072	}
1712		2073
1713	#############################################################################	2074	#############################################################################
1714		2075
1715	package CFClient::UI::EntryBase;	2076	package CFPlus::UI::EntryBase;
1716		2077
1717	our @ISA = CFClient::UI::Label::;	2078	our @ISA = CFPlus::UI::Label::;
1718		2079
1719	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1720		2081
1721	sub new {	2082	sub new {
1722	my $class = shift;	2083	my $class = shift;
1723		2084
1724	$class->SUPER::new (	2085	$class->SUPER::new (
…		…
1728	active_fg => [0, 0, 0],	2089	active_fg => [0, 0, 0],
1729	can_hover => 1,	2090	can_hover => 1,
1730	can_focus => 1,	2091	can_focus => 1,
1731	valign => 0,	2092	valign => 0,
1732	can_events => 1,	2093	can_events => 1,
		2094	ellipsise => 0,
1733	#text => ...	2095	#text => ...
1734	#hidden => "*",	2096	#hidden => "*",
1735	@_	2097	@_
1736	)	2098	)
1737	}	2099	}
…		…
1782	my $sym = $ev->{sym};	2144	my $sym = $ev->{sym};
1783	my $uni = $ev->{unicode};	2145	my $uni = $ev->{unicode};
1784		2146
1785	my $text = $self->get_text;	2147	my $text = $self->get_text;
1786		2148
		2149	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2150
1787	if ($uni == 8) {	2151	if ($uni == 8) {
1788	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2152	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789	} elsif ($uni == 127) {	2153	} elsif ($uni == 127) {
1790	substr $text, $self->{cursor}, 1, "";	2154	substr $text, $self->{cursor}, 1, "";
1791	} elsif ($sym == CFClient::SDLK_LEFT) {	2155	} elsif ($sym == CFPlus::SDLK_LEFT) {
1792	--$self->{cursor} if $self->{cursor};	2156	--$self->{cursor} if $self->{cursor};
1793	} elsif ($sym == CFClient::SDLK_RIGHT) {	2157	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1794	++$self->{cursor} if $self->{cursor} < length $self->{text};	2158	++$self->{cursor} if $self->{cursor} < length $self->{text};
1795	} elsif ($sym == CFClient::SDLK_HOME) {	2159	} elsif ($sym == CFPlus::SDLK_HOME) {
		2160	# what a hack
		2161	$self->{cursor} =
		2162	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2163	? length $1
		2164	: 0;
		2165	} elsif ($sym == CFPlus::SDLK_END) {
		2166	# uh, again
		2167	$self->{cursor} =
		2168	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2169	? $self->{cursor} + length $1
		2170	: length $self->{text};
		2171	} elsif ($uni == 21) { # ctrl-u
		2172	$text = "";
1796	$self->{cursor} = 0;	2173	$self->{cursor} = 0;
1797	} elsif ($sym == CFClient::SDLK_END) {
1798	$self->{cursor} = length $text;
1799	} elsif ($uni == 27) {	2174	} elsif ($uni == 27) {
1800	$self->emit ('escape');	2175	$self->emit ('escape');
1801	} elsif ($uni) {	2176	} elsif ($uni == 0x0d) {
		2177	substr $text, $self->{cursor}++, 0, "\012";
		2178	} elsif ($uni >= 0x20) {
1802	substr $text, $self->{cursor}++, 0, chr $uni;	2179	substr $text, $self->{cursor}++, 0, chr $uni;
1803	} else {	2180	} else {
1804	return 0;	2181	return 0;
1805	}	2182	}
1806		2183
1807	$self->_set_text ($text);	2184	$self->_set_text ($text);
1808		2185
1809	$self->realloc;	2186	$self->realloc;
		2187	$self->update;
1810		2188
1811	1	2189	1
1812	}	2190	}
1813		2191
1814	sub invoke_focus_in {	2192	sub invoke_focus_in {
…		…
1826		2204
1827	my $idx = $self->{layout}->xy_to_index ($x, $y);	2205	my $idx = $self->{layout}->xy_to_index ($x, $y);
1828		2206
1829	# byte-index to char-index	2207	# byte-index to char-index
1830	my $text = $self->{text};	2208	my $text = $self->{text};
1831	utf8::encode $text;	2209	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832	$self->{cursor} = length substr $text, 0, $idx;	2210	$self->{cursor} = length $text;
1833		2211
1834	$self->_set_text ($self->{text});	2212	$self->_set_text ($self->{text});
1835	$self->update;	2213	$self->update;
1836		2214
1837	1	2215	1
…		…
1876	utf8::encode $text;	2254	utf8::encode $text;
1877		2255
1878	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2256	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879	}	2257	}
1880		2258
1881	glColor @{$self->{fg}};
1882	glBegin GL_LINES;	2259	glBegin GL_LINES;
1883	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2260	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1884	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2261	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885	glEnd;	2262	glEnd;
1886	}	2263	}
1887	}	2264	}
1888		2265
		2266	#############################################################################
		2267
1889	package CFClient::UI::Entry;	2268	package CFPlus::UI::Entry;
1890		2269
1891	our @ISA = CFClient::UI::EntryBase::;	2270	our @ISA = CFPlus::UI::EntryBase::;
1892		2271
1893	use CFClient::OpenGL;	2272	use CFPlus::OpenGL;
1894		2273
1895	sub invoke_key_down {	2274	sub invoke_key_down {
1896	my ($self, $ev) = @_;	2275	my ($self, $ev) = @_;
1897		2276
1898	my $sym = $ev->{sym};	2277	my $sym = $ev->{sym};
1899		2278
1900	if ($sym == 13) {	2279	if ($ev->{uni} == 0x0d || $sym == 13) {
1901	unshift @{$self->{history}},	2280	unshift @{$self->{history}},
1902	my $txt = $self->get_text;	2281	my $txt = $self->get_text;
1903		2282
1904	$self->{history_pointer} = -1;	2283	$self->{history_pointer} = -1;
1905	$self->{history_saveback} = '';	2284	$self->{history_saveback} = '';
1906	$self->emit (activate => $txt);	2285	$self->emit (activate => $txt);
1907	$self->update;	2286	$self->update;
1908		2287
1909	} elsif ($sym == CFClient::SDLK_UP) {	2288	} elsif ($sym == CFPlus::SDLK_UP) {
1910	if ($self->{history_pointer} < 0) {	2289	if ($self->{history_pointer} < 0) {
1911	$self->{history_saveback} = $self->get_text;	2290	$self->{history_saveback} = $self->get_text;
1912	}	2291	}
1913	if (@{$self->{history} || []} > 0) {	2292	if (@{$self->{history} || []} > 0) {
1914	$self->{history_pointer}++;	2293	$self->{history_pointer}++;
…		…
1916	$self->{history_pointer} = @{$self->{history} || []} - 1;	2295	$self->{history_pointer} = @{$self->{history} || []} - 1;
1917	}	2296	}
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2297	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1919	}	2298	}
1920		2299
1921	} elsif ($sym == CFClient::SDLK_DOWN) {	2300	} elsif ($sym == CFPlus::SDLK_DOWN) {
1922	$self->{history_pointer}--;	2301	$self->{history_pointer}--;
1923	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2302	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924		2303
1925	if ($self->{history_pointer} >= 0) {	2304	if ($self->{history_pointer} >= 0) {
1926	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2305	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1935	1	2314	1
1936	}	2315	}
1937		2316
1938	#############################################################################	2317	#############################################################################
1939		2318
		2319	package CFPlus::UI::TextEdit;
		2320
		2321	our @ISA = CFPlus::UI::EntryBase::;
		2322
		2323	use CFPlus::OpenGL;
		2324
		2325	sub move_cursor_ver {
		2326	my ($self, $dy) = @_;
		2327
		2328	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2329
		2330	$y += $dy;
		2331
		2332	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2333	$self->{cursor} = $index;
		2334	delete $self->{cur_h};
		2335	$self->update;
		2336	return;
		2337	}
		2338	}
		2339
		2340	sub invoke_key_down {
		2341	my ($self, $ev) = @_;
		2342
		2343	my $sym = $ev->{sym};
		2344
		2345	if ($sym == CFPlus::SDLK_UP) {
		2346	$self->move_cursor_ver (-1);
		2347	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2348	$self->move_cursor_ver (+1);
		2349	} else {
		2350	return $self->SUPER::invoke_key_down ($ev)
		2351	}
		2352
		2353	1
		2354	}
		2355
		2356	#############################################################################
		2357
1940	package CFClient::UI::Button;	2358	package CFPlus::UI::Button;
1941		2359
1942	our @ISA = CFClient::UI::Label::;	2360	our @ISA = CFPlus::UI::Label::;
1943		2361
1944	use CFClient::OpenGL;	2362	use CFPlus::OpenGL;
1945		2363
1946	my @tex =	2364	my @tex =
1947	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2365	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948	qw(b1_button_active.png);	2366	qw(b1_button_inactive.png b1_button_active.png);
1949		2367
1950	sub new {	2368	sub new {
1951	my $class = shift;	2369	my $class = shift;
1952		2370
1953	$class->SUPER::new (	2371	$class->SUPER::new (
1954	padding_x => 4,	2372	padding_x => 4,
1955	padding_y => 4,	2373	padding_y => 4,
1956	fg => [1, 1, 1],	2374	fg => [1.0, 1.0, 1.0],
1957	active_fg => [0, 0, 1],	2375	active_fg => [0.8, 0.8, 0.8],
1958	can_hover => 1,	2376	can_hover => 1,
1959	align => 0,	2377	align => 0,
1960	valign => 0,	2378	valign => 0,
1961	can_events => 1,	2379	can_events => 1,
1962	@_	2380	@_
…		…
1980		2398
1981	glEnable GL_TEXTURE_2D;	2399	glEnable GL_TEXTURE_2D;
1982	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2400	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983	glColor 0, 0, 0, 1;	2401	glColor 0, 0, 0, 1;
1984		2402
		2403	my $tex = $tex[$GRAB == $self];
1985	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2404	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1986		2405
1987	glDisable GL_TEXTURE_2D;	2406	glDisable GL_TEXTURE_2D;
1988		2407
1989	$self->SUPER::_draw;	2408	$self->SUPER::_draw;
1990	}	2409	}
1991		2410
1992	#############################################################################	2411	#############################################################################
1993		2412
		2413	package CFPlus::UI::CheckBox;
		2414
		2415	our @ISA = CFPlus::UI::DrawBG::;
		2416
		2417	my @tex =
		2418	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2419	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2420
		2421	use CFPlus::OpenGL;
		2422
		2423	sub new {
		2424	my $class = shift;
		2425
		2426	$class->SUPER::new (
		2427	padding_x => 2,
		2428	padding_y => 2,
		2429	fg => [1, 1, 1],
		2430	active_fg => [1, 1, 0],
		2431	bg => [0, 0, 0, 0.2],
		2432	active_bg => [1, 1, 1, 0.5],
		2433	state => 0,
		2434	can_hover => 1,
		2435	@_
		2436	)
		2437	}
		2438
		2439	sub size_request {
		2440	my ($self) = @_;
		2441
		2442	(6) x 2
		2443	}
		2444
		2445	sub toggle {
		2446	my ($self) = @_;
		2447
		2448	$self->{state} = !$self->{state};
		2449	$self->emit (changed => $self->{state});
		2450	$self->update;
		2451	}
		2452
		2453	sub invoke_button_down {
		2454	my ($self, $ev, $x, $y) = @_;
		2455
		2456	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2457	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2458	$self->toggle;
		2459	} else {
		2460	return 0
		2461	}
		2462
		2463	1
		2464	}
		2465
		2466	sub _draw {
		2467	my ($self) = @_;
		2468
		2469	$self->SUPER::_draw;
		2470
		2471	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2472
		2473	my ($w, $h) = @$self{qw(w h)};
		2474
		2475	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2476
		2477	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2478
		2479	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2480
		2481	glEnable GL_TEXTURE_2D;
		2482	$tex->draw_quad_alpha (0, 0, $s, $s);
		2483	glDisable GL_TEXTURE_2D;
		2484	}
		2485
		2486	#############################################################################
		2487
		2488	package CFPlus::UI::Image;
		2489
		2490	our @ISA = CFPlus::UI::Base::;
		2491
		2492	use CFPlus::OpenGL;
		2493
		2494	our %texture_cache;
		2495
		2496	sub new {
		2497	my $class = shift;
		2498
		2499	my $self = $class->SUPER::new (
		2500	can_events => 0,
		2501	@_,
		2502	);
		2503
		2504	$self->{path} || $self->{tex}
		2505	or Carp::croak "'path' or 'tex' attributes required";
		2506
		2507	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2508	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2509
		2510	CFPlus::weaken $texture_cache{$self->{path}};
		2511
		2512	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2513
		2514	$self
		2515	}
		2516
		2517	sub STORABLE_freeze {
		2518	my ($self, $cloning) = @_;
		2519
		2520	$self->{path}
		2521	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2522
		2523	$self->{path}
		2524	}
		2525
		2526	sub STORABLE_attach {
		2527	my ($self, $cloning, $path) = @_;
		2528
		2529	$self->new (path => $path)
		2530	}
		2531
		2532	sub size_request {
		2533	my ($self) = @_;
		2534
		2535	($self->{tex}{w}, $self->{tex}{h})
		2536	}
		2537
		2538	sub _draw {
		2539	my ($self) = @_;
		2540
		2541	my $tex = $self->{tex};
		2542
		2543	my ($w, $h) = ($self->{w}, $self->{h});
		2544
		2545	if ($self->{rot90}) {
		2546	glRotate 90, 0, 0, 1;
		2547	glTranslate 0, -$self->{w}, 0;
		2548
		2549	($w, $h) = ($h, $w);
		2550	}
		2551
		2552	glEnable GL_TEXTURE_2D;
		2553	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2554
		2555	$tex->draw_quad (0, 0, $w, $h);
		2556
		2557	glDisable GL_TEXTURE_2D;
		2558	}
		2559
		2560	#############################################################################
		2561
1994	package CFClient::UI::ImageButton;	2562	package CFPlus::UI::ImageButton;
1995		2563
1996	our @ISA = CFClient::UI::Image::;	2564	our @ISA = CFPlus::UI::Image::;
1997		2565
1998	use CFClient::OpenGL;	2566	use CFPlus::OpenGL;
1999		2567
2000	my %textures;	2568	my %textures;
2001		2569
2002	sub new {	2570	sub new {
2003	my $class = shift;	2571	my $class = shift;
…		…
2025	1	2593	1
2026	}	2594	}
2027		2595
2028	#############################################################################	2596	#############################################################################
2029		2597
2030	package CFClient::UI::CheckBox;
2031
2032	our @ISA = CFClient::UI::DrawBG::;
2033
2034	my @tex =
2035	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038	use CFClient::OpenGL;
2039
2040	sub new {
2041	my $class = shift;
2042
2043	$class->SUPER::new (
2044	padding_x => 2,
2045	padding_y => 2,
2046	fg => [1, 1, 1],
2047	active_fg => [1, 1, 0],
2048	bg => [0, 0, 0, 0.2],
2049	active_bg => [1, 1, 1, 0.5],
2050	state => 0,
2051	can_hover => 1,
2052	@_
2053	)
2054	}
2055
2056	sub size_request {
2057	my ($self) = @_;
2058
2059	(6) x 2
2060	}
2061
2062	sub invoke_button_down {
2063	my ($self, $ev, $x, $y) = @_;
2064
2065	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067	$self->{state} = !$self->{state};
2068	$self->emit (changed => $self->{state});
2069	} else {
2070	return 0
2071	}
2072
2073	1
2074	}
2075
2076	sub _draw {
2077	my ($self) = @_;
2078
2079	$self->SUPER::_draw;
2080
2081	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2082
2083	my ($w, $h) = @$self{qw(w h)};
2084
2085	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2086
2087	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2088
2089	my $tex = $self->{state} ? $tex[1] : $tex[0];
2090
2091	glEnable GL_TEXTURE_2D;
2092	$tex->draw_quad_alpha (0, 0, $s, $s);
2093	glDisable GL_TEXTURE_2D;
2094	}
2095
2096	#############################################################################
2097
2098	package CFClient::UI::Image;	2598	package CFPlus::UI::VGauge;
2099		2599
2100	our @ISA = CFClient::UI::Base::;	2600	our @ISA = CFPlus::UI::Base::;
2101
2102	use CFClient::OpenGL;
2103
2104	our %texture_cache;
2105
2106	sub new {
2107	my $class = shift;
2108
2109	my $self = $class->SUPER::new (
2110	can_events => 0,
2111	@_,
2112	);
2113
2114	$self->{path}
2115	or Carp::croak "required attribute 'path' not set";
2116
2117	$self->{tex} = $texture_cache{$self->{path}} ||=
2118	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2119
2120	Scalar::Util::weaken $texture_cache{$self->{path}};
2121
2122	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2123
2124	$self
2125	}
2126
2127	sub size_request {
2128	my ($self) = @_;
2129
2130	($self->{tex}{w}, $self->{tex}{h})
2131	}
2132
2133	sub _draw {
2134	my ($self) = @_;
2135
2136	my $tex = $self->{tex};
2137
2138	my ($w, $h) = ($self->{w}, $self->{h});
2139
2140	if ($self->{rot90}) {
2141	glRotate 90, 0, 0, 1;
2142	glTranslate 0, -$self->{w}, 0;
2143
2144	($w, $h) = ($h, $w);
2145	}
2146
2147	glEnable GL_TEXTURE_2D;
2148	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2149
2150	$tex->draw_quad_alpha (0, 0, $w, $h);
2151
2152	glDisable GL_TEXTURE_2D;
2153	}
2154
2155	#############################################################################
2156
2157	package CFClient::UI::VGauge;
2158
2159	our @ISA = CFClient::UI::Base::;
2160		2601
2161	use List::Util qw(min max);	2602	use List::Util qw(min max);
2162		2603
2163	use CFClient::OpenGL;	2604	use CFPlus::OpenGL;
2164		2605
2165	my %tex = (	2606	my %tex = (
2166	food => [	2607	food => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2608	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2609	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169	],	2610	],
2170	grace => [	2611	grace => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2612	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2613	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173	],	2614	],
2174	hp => [	2615	hp => [
2175	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2616	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2617	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177	],	2618	],
2178	mana => [	2619	mana => [
2179	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2620	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2180	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2621	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181	],	2622	],
2182	);	2623	);
2183		2624
2184	# eg. VGauge->new (gauge => 'food'), default gauge: food	2625	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2244	my $ycut1 = max 0, min 1, $ycut;	2685	my $ycut1 = max 0, min 1, $ycut;
2245	my $ycut2 = max 0, min 1, $ycut - 1;	2686	my $ycut2 = max 0, min 1, $ycut - 1;
2246		2687
2247	my $h1 = $self->{h} * (1 - $ycut1);	2688	my $h1 = $self->{h} * (1 - $ycut1);
2248	my $h2 = $self->{h} * (1 - $ycut2);	2689	my $h2 = $self->{h} * (1 - $ycut2);
		2690	my $h3 = $self->{h};
		2691
		2692	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249		2693
2250	glEnable GL_BLEND;	2694	glEnable GL_BLEND;
2251	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2695	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2696	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253	glEnable GL_TEXTURE_2D;	2697	glEnable GL_TEXTURE_2D;
…		…
2272		2716
2273	if ($t3) {	2717	if ($t3) {
2274	glBindTexture GL_TEXTURE_2D, $t3->{name};	2718	glBindTexture GL_TEXTURE_2D, $t3->{name};
2275	glBegin GL_QUADS;	2719	glBegin GL_QUADS;
2276	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2720	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2721	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2722	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2723	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280	glEnd;	2724	glEnd;
2281	}	2725	}
2282		2726
2283	glDisable GL_BLEND;	2727	glDisable GL_BLEND;
2284	glDisable GL_TEXTURE_2D;	2728	glDisable GL_TEXTURE_2D;
2285	}	2729	}
2286		2730
2287	#############################################################################	2731	#############################################################################
2288		2732
2289	package CFClient::UI::Gauge;	2733	package CFPlus::UI::Gauge;
2290		2734
2291	our @ISA = CFClient::UI::VBox::;	2735	our @ISA = CFPlus::UI::VBox::;
2292		2736
2293	sub new {	2737	sub new {
2294	my ($class, %arg) = @_;	2738	my ($class, %arg) = @_;
2295		2739
2296	my $self = $class->SUPER::new (	2740	my $self = $class->SUPER::new (
…		…
2298	can_hover => 1,	2742	can_hover => 1,
2299	can_events => 1,	2743	can_events => 1,
2300	%arg,	2744	%arg,
2301	);	2745	);
2302		2746
2303	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2747	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2304	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2748	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2305	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2749	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306		2750
2307	$self	2751	$self
2308	}	2752	}
2309		2753
2310	sub set_fontsize {	2754	sub set_fontsize {
…		…
2331	$self->{value}->set_text ($val);	2775	$self->{value}->set_text ($val);
2332	}	2776	}
2333		2777
2334	#############################################################################	2778	#############################################################################
2335		2779
2336	package CFClient::UI::Slider;	2780	package CFPlus::UI::Slider;
2337		2781
2338	use strict;	2782	use strict;
2339		2783
2340	use CFClient::OpenGL;	2784	use CFPlus::OpenGL;
2341		2785
2342	our @ISA = CFClient::UI::DrawBG::;	2786	our @ISA = CFPlus::UI::DrawBG::;
2343		2787
2344	my @tex =	2788	my @tex =
2345	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2789	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346	qw(s1_slider.png s1_slider_bg.png);	2790	qw(s1_slider.png s1_slider_bg.png);
2347		2791
2348	sub new {	2792	sub new {
2349	my $class = shift;	2793	my $class = shift;
2350		2794
…		…
2439	}	2883	}
2440		2884
2441	1	2885	1
2442	}	2886	}
2443		2887
		2888	sub invoke_mouse_wheel {
		2889	my ($self, $ev) = @_;
		2890
		2891	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2892
		2893	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2894
		2895	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2896
		2897	! ! $delta
		2898	}
		2899
2444	sub update {	2900	sub update {
2445	my ($self) = @_;	2901	my ($self) = @_;
2446		2902
2447	delete $self->{knob_w};	2903	delete $self->{knob_w};
2448	$self->SUPER::update;	2904	$self->SUPER::update;
…		…
2495	glDisable GL_TEXTURE_2D;	2951	glDisable GL_TEXTURE_2D;
2496	}	2952	}
2497		2953
2498	#############################################################################	2954	#############################################################################
2499		2955
2500	package CFClient::UI::ValSlider;	2956	package CFPlus::UI::ValSlider;
2501		2957
2502	our @ISA = CFClient::UI::HBox::;	2958	our @ISA = CFPlus::UI::HBox::;
2503		2959
2504	sub new {	2960	sub new {
2505	my ($class, %arg) = @_;	2961	my ($class, %arg) = @_;
2506		2962
2507	my $range = delete $arg{range};	2963	my $range = delete $arg{range};
2508		2964
2509	my $self = $class->SUPER::new (	2965	my $self = $class->SUPER::new (
2510	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2966	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2967	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512	to_value => sub { shift },	2968	to_value => sub { shift },
2513	from_value => sub { shift },	2969	from_value => sub { shift },
2514	%arg,	2970	%arg,
2515	);	2971	);
2516		2972
…		…
2536	sub set_range { shift->{slider}->set_range (@_) }	2992	sub set_range { shift->{slider}->set_range (@_) }
2537	sub set_value { shift->{slider}->set_value (@_) }	2993	sub set_value { shift->{slider}->set_value (@_) }
2538		2994
2539	#############################################################################	2995	#############################################################################
2540		2996
2541	package CFClient::UI::TextScroller;	2997	package CFPlus::UI::TextScroller;
2542		2998
2543	our @ISA = CFClient::UI::HBox::;	2999	our @ISA = CFPlus::UI::HBox::;
2544		3000
2545	use CFClient::OpenGL;	3001	use CFPlus::OpenGL;
2546		3002
2547	sub new {	3003	sub new {
2548	my $class = shift;	3004	my $class = shift;
2549		3005
2550	my $self = $class->SUPER::new (	3006	my $self = $class->SUPER::new (
2551	fontsize => 1,	3007	fontsize => 1,
2552	can_events => 0,	3008	can_events => 1,
2553	indent => 0,	3009	indent => 0,
2554	#font => default_font	3010	#font => default_font
2555	@_,	3011	@_,
2556		3012
2557	layout => (new CFClient::Layout 1),	3013	layout => (new CFPlus::Layout),
2558	par => [],	3014	par => [],
		3015	max_par => 0,
2559	height => 0,	3016	height => 0,
2560	children => [	3017	children => [
2561	(new CFClient::UI::Empty expand => 1),	3018	(new CFPlus::UI::Empty expand => 1),
2562	(new CFClient::UI::Slider vertical => 1),	3019	(new CFPlus::UI::Slider vertical => 1),
2563	],	3020	],
2564	);	3021	);
2565		3022
2566	$self->{children}[1]->connect (changed => sub { $self->update });	3023	$self->{children}[1]->connect (changed => sub { $self->update });
2567		3024
…		…
2597		3054
2598	$self->reflow;	3055	$self->reflow;
2599		3056
2600	local $self->{children} = [$empty, $slider];	3057	local $self->{children} = [$empty, $slider];
2601	$self->SUPER::invoke_size_allocate ($w, $h)	3058	$self->SUPER::invoke_size_allocate ($w, $h)
		3059	}
		3060
		3061	sub invoke_mouse_wheel {
		3062	my ($self, $ev) = @_;
		3063
		3064	return 0 unless $ev->{dy}; # only vertical movements
		3065
		3066	$self->{children}[1]->emit (mouse_wheel => $ev);
		3067
		3068	1
2602	}	3069	}
2603		3070
2604	sub get_layout {	3071	sub get_layout {
2605	my ($self, $para) = @_;	3072	my ($self, $para) = @_;
2606		3073
…		…
2634		3101
2635	# todo: base offset on lines or so, not on pixels	3102	# todo: base offset on lines or so, not on pixels
2636	$self->{children}[1]->set_value ($offset);	3103	$self->{children}[1]->set_value ($offset);
2637	}	3104	}
2638		3105
		3106	sub current_paragraph {
		3107	my ($self) = @_;
		3108
		3109	$self->{top_paragraph} - 1
		3110	}
		3111
		3112	sub scroll_to {
		3113	my ($self, $para) = @_;
		3114
		3115	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3116
		3117	$self->{scroll_to} = $para;
		3118	$self->update;
		3119	}
		3120
2639	sub clear {	3121	sub clear {
2640	my ($self) = @_;	3122	my ($self) = @_;
2641		3123
2642	my (undef, undef, @other) = @{ $self->{children} };	3124	my (undef, undef, @other) = @{ $self->{children} };
2643	$self->remove ($_) for @other;	3125	$self->remove ($_) for @other;
…		…
2646	$self->{height} = 0;	3128	$self->{height} = 0;
2647	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3129	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648	}	3130	}
2649		3131
2650	sub add_paragraph {	3132	sub add_paragraph {
2651	my ($self, $color, $para, $indent) = @_;	3133	my $self = shift;
2652		3134
2653	my ($text, @w) = ref $para ? @$para : $para;	3135	for my $para (@_) {
2654
2655	$para = {	3136	$para = {
		3137	fg => [1, 1, 1, 1],
		3138	indent => 0,
		3139	markup => "",
		3140	widget => [],
		3141	ref $para ? %$para : (markup => $para),
2656	w => 1e10,	3142	w => 1e10,
2657	wrapped => 1,	3143	wrapped => 1,
2658	fg => $color,
2659	indent => $indent,
2660	markup => $text,
2661	widget => \@w,
2662	};	3144	};
2663		3145
2664	$self->add (@w) if @w;	3146	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665	push @{$self->{par}}, $para;	3147	push @{$self->{par}}, $para;
		3148	}
		3149
		3150	if (my $max = $self->{max_par}) {
		3151	shift @{$self->{par}} while @{$self->{par}} > $max;
		3152	}
2666		3153
2667	$self->{need_reflow}++;	3154	$self->{need_reflow}++;
2668	$self->update;	3155	$self->update;
2669	}	3156	}
2670		3157
2671	sub scroll_to_bottom {	3158	sub scroll_to_bottom {
2672	my ($self) = @_;	3159	my ($self) = @_;
2673		3160
2674	$self->{scroll_to_bottom} = 1;	3161	$self->{scroll_to} = $#{$self->{par}};
2675	$self->update;	3162	$self->update;
2676	}	3163	}
2677		3164
		3165	sub force_uptodate {
		3166	my ($self) = @_;
		3167
		3168	if (delete $self->{need_reflow}) {
		3169	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3170
		3171	my $height = 0;
		3172
		3173	for my $para (@{$self->{par}}) {
		3174	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3175	my $layout = $self->get_layout ($para);
		3176	my ($w, $h) = $layout->size;
		3177
		3178	$para->{w} = $w + $para->{indent};
		3179	$para->{h} = $h;
		3180	$para->{wrapped} = $layout->has_wrapped;
		3181	}
		3182
		3183	$para->{y} = $height;
		3184	$height += $para->{h};
		3185	}
		3186
		3187	$self->{height} = $height;
		3188	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3189
		3190	delete $self->{texture};
		3191	}
		3192
		3193	if (my $paridx = delete $self->{scroll_to}) {
		3194	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3195	}
		3196	}
		3197
2678	sub update {	3198	sub update {
2679	my ($self) = @_;	3199	my ($self) = @_;
2680		3200
2681	$self->SUPER::update;	3201	$self->SUPER::update;
2682		3202
2683	return unless $self->{h} > 0;	3203	return unless $self->{h} > 0;
2684		3204
2685	delete $self->{texture};	3205	delete $self->{texture};
2686		3206
2687	$ROOT->on_post_alloc ($self => sub {	3207	$ROOT->on_post_alloc ($self => sub {
		3208	$self->force_uptodate;
		3209
2688	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3210	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689		3211
2690	if (delete $self->{need_reflow}) {
2691	my $height = 0;
2692
2693	for my $para (@{$self->{par}}) {
2694	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2695	my $layout = $self->get_layout ($para);
2696	my ($w, $h) = $layout->size;
2697
2698	$para->{w} = $w + $para->{indent};
2699	$para->{h} = $h;
2700	$para->{wrapped} = $layout->has_wrapped;
2701	}
2702
2703	$height += $para->{h};
2704	}
2705
2706	$self->{height} = $height;
2707
2708	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2709
2710	delete $self->{texture};
2711	}
2712
2713	if (delete $self->{scroll_to_bottom}) {
2714	$self->{children}[1]->set_value (1e10);
2715	}
2716
2717	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3212	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718	glClearColor 0, 0, 0, 0;	3213	glClearColor 0, 0, 0, 0;
2719	glClear GL_COLOR_BUFFER_BIT;	3214	glClear GL_COLOR_BUFFER_BIT;
2720		3215
		3216	package CFPlus::UI::Base;
		3217	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3218	(0, 0, $self->{w}, $self->{h});
		3219
		3220	my $top = int $self->{children}[1]{range}[0];
		3221
		3222	my $paridx = 0;
		3223	my $top_paragraph;
2721	my $top = int $self->{children}[1]{range}[0];	3224	my $top = int $self->{children}[1]{range}[0];
2722		3225
2723	my $y0 = $top;	3226	my $y0 = $top;
2724	my $y1 = $top + $H;	3227	my $y1 = $top + $H;
2725		3228
2726	my $y = 0;
2727
2728	glEnable GL_BLEND;
2729	#TODO# not correct in windows where rgba is forced off
2730	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2731
2732	for my $para (@{$self->{par}}) {	3229	for my $para (@{$self->{par}}) {
2733	my $h = $para->{h};	3230	my $h = $para->{h};
		3231	my $y = $para->{y};
2734		3232
2735	if ($y0 < $y + $h && $y < $y1) {	3233	if ($y0 < $y + $h && $y < $y1) {
2736
2737	my $layout = $self->get_layout ($para);	3234	my $layout = $self->get_layout ($para);
2738		3235
2739	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741	glRasterPos $para->{indent}, $y - $y0;	3236	$layout->render ($para->{indent}, $y - $y0);
2742	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743		3237
2744	if (my @w = @{ $para->{widget} }) {	3238	if (my @w = @{ $para->{widget} }) {
2745	my @s = $layout->get_shapes;	3239	my @s = $layout->get_shapes;
2746		3240
2747	for (@w) {	3241	for (@w) {
…		…
2753	$_->draw;	3247	$_->draw;
2754	}	3248	}
2755	}	3249	}
2756	}	3250	}
2757		3251
2758	$y += $h;	3252	$paridx++;
		3253	$top_paragraph ||= $paridx if $y >= $top;
2759	}	3254	}
2760		3255
2761	glDisable GL_BLEND;	3256	$self->{top_paragraph} = $top_paragraph;
2762	};	3257	};
2763	});	3258	});
2764	}	3259	}
2765		3260
2766	sub reconfigure {	3261	sub reconfigure {
…		…
2784	$self->{children}[1]->draw;	3279	$self->{children}[1]->draw;
2785	}	3280	}
2786		3281
2787	#############################################################################	3282	#############################################################################
2788		3283
2789	package CFClient::UI::Animator;	3284	package CFPlus::UI::Animator;
2790		3285
2791	use CFClient::OpenGL;	3286	use CFPlus::OpenGL;
2792		3287
2793	our @ISA = CFClient::UI::Bin::;	3288	our @ISA = CFPlus::UI::Bin::;
2794		3289
2795	sub moveto {	3290	sub moveto {
2796	my ($self, $x, $y) = @_;	3291	my ($self, $x, $y) = @_;
2797		3292
2798	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3293	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2826	glPopMatrix;	3321	glPopMatrix;
2827	}	3322	}
2828		3323
2829	#############################################################################	3324	#############################################################################
2830		3325
2831	package CFClient::UI::Flopper;	3326	package CFPlus::UI::Flopper;
2832		3327
2833	our @ISA = CFClient::UI::Button::;	3328	our @ISA = CFPlus::UI::Button::;
2834		3329
2835	sub new {	3330	sub new {
2836	my $class = shift;	3331	my $class = shift;
2837		3332
2838	my $self = $class->SUPER::new (	3333	my $self = $class->SUPER::new (
…		…
2850	$self->{other}->toggle_visibility;	3345	$self->{other}->toggle_visibility;
2851	}	3346	}
2852		3347
2853	#############################################################################	3348	#############################################################################
2854		3349
2855	package CFClient::UI::Tooltip;	3350	package CFPlus::UI::Tooltip;
2856		3351
2857	our @ISA = CFClient::UI::Bin::;	3352	our @ISA = CFPlus::UI::Bin::;
2858		3353
2859	use CFClient::OpenGL;	3354	use CFPlus::OpenGL;
2860		3355
2861	sub new {	3356	sub new {
2862	my $class = shift;	3357	my $class = shift;
2863		3358
2864	$class->SUPER::new (	3359	$class->SUPER::new (
…		…
2867	)	3362	)
2868	}	3363	}
2869		3364
2870	sub set_tooltip_from {	3365	sub set_tooltip_from {
2871	my ($self, $widget) = @_;	3366	my ($self, $widget) = @_;
		3367
		3368	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3369	if $widget->{tooltip} =~ /^#(.*)$/;
2872		3370
2873	my $tooltip = $widget->{tooltip};	3371	my $tooltip = $widget->{tooltip};
2874		3372
2875	if ($ENV{CFPLUS_DEBUG} & 2) {	3373	if ($ENV{CFPLUS_DEBUG} & 2) {
2876	$tooltip .= "\n\n" . (ref $widget) . "\n"	3374	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2880	}	3378	}
2881		3379
2882	$tooltip =~ s/^\n+//;	3380	$tooltip =~ s/^\n+//;
2883	$tooltip =~ s/\n+$//;	3381	$tooltip =~ s/\n+$//;
2884		3382
2885	$self->add (new CFClient::UI::Label	3383	$self->add (new CFPlus::UI::Label
2886	markup => $tooltip,	3384	markup => $tooltip,
2887	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3385	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888	fontsize => 0.8,	3386	fontsize => 0.8,
2889	fg => [0, 0, 0, 1],	3387	style => 1, # FLAG_INVERSE
2890	ellipsise => 0,	3388	ellipsise => 0,
2891	font => ($widget->{tooltip_font} || $::FONT_PROP),	3389	font => ($widget->{tooltip_font} || $::FONT_PROP),
2892	);	3390	);
2893	}	3391	}
2894		3392
…		…
2913		3411
2914	$self->{root}->on_post_alloc ("move_$self" => sub {	3412	$self->{root}->on_post_alloc ("move_$self" => sub {
2915	my $widget = $self->{owner}	3413	my $widget = $self->{owner}
2916	or return;	3414	or return;
2917		3415
		3416	if ($widget->{visible}) {
2918	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3417	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919		3418
2920	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3419	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921	if $x + $self->{w} > $self->{root}{w};	3420	if $x + $self->{w} > $self->{root}{w};
2922		3421
2923	$self->move_abs ($x, $y);	3422	$self->move_abs ($x, $y);
		3423	} else {
		3424	$self->hide;
		3425	}
2924	});	3426	});
2925	}	3427	}
2926		3428
2927	sub _draw {	3429	sub _draw {
2928	my ($self) = @_;	3430	my ($self) = @_;
…		…
2952	$self->SUPER::_draw;	3454	$self->SUPER::_draw;
2953	}	3455	}
2954		3456
2955	#############################################################################	3457	#############################################################################
2956		3458
2957	package CFClient::UI::Face;	3459	package CFPlus::UI::Face;
2958		3460
2959	our @ISA = CFClient::UI::Base::;	3461	our @ISA = CFPlus::UI::DrawBG::;
2960		3462
2961	use CFClient::OpenGL;	3463	use CFPlus::OpenGL;
2962		3464
2963	sub new {	3465	sub new {
2964	my $class = shift;	3466	my $class = shift;
2965		3467
2966	my $self = $class->SUPER::new (	3468	my $self = $class->SUPER::new (
		3469	size_w => 32,
		3470	size_h => 8,
2967	aspect => 1,	3471	aspect => 1,
2968	can_events => 0,	3472	can_events => 0,
2969	@_,	3473	@_,
2970	);	3474	);
2971		3475
2972	if ($self->{anim} && $self->{animspeed}) {	3476	if ($self->{anim} && $self->{animspeed}) {
2973	Scalar::Util::weaken (my $widget = $self);	3477	CFPlus::weaken (my $widget = $self);
2974		3478
		3479	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3480	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2975	$self->{timer} = Event->timer (	3481	$self->{timer} = Event->timer (
2976	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2977	hard => 1,	3482	parked => 1,
2978	interval => $self->{animspeed},
2979	cb => sub {	3483	cb => sub {
		3484	return unless $::CONN && $widget;
		3485
2980	++$widget->{frame};	3486	++$widget->{frame};
		3487	$widget->update_face;
2981	$widget->update;	3488	$widget->update;
		3489
		3490	$widget->update_timer;
2982	},	3491	},
2983	);	3492	);
		3493
		3494	$self->update_face;
		3495	$self->update_timer;
2984	}	3496	}
2985		3497
2986	$self	3498	$self
2987	}	3499	}
2988		3500
		3501	sub update_timer {
		3502	my ($self) = @_;
		3503
		3504	return unless $self->{timer};
		3505
		3506	if ($self->{visible}) {
		3507	$self->{timer}->at (
		3508	$self->{anim_start}
		3509	+ $self->{animspeed}
		3510	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3511	);
		3512	$self->{timer}->start;
		3513	} else {
		3514	$self->{timer}->stop;
		3515	}
		3516	}
		3517
		3518	sub update_face {
		3519	my ($self) = @_;
		3520
		3521	return unless $::CONN;
		3522
		3523	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3524	if ($anim && @$anim) {
		3525	delete $self->{wait_face};
		3526	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3527	}
		3528	}
		3529	}
		3530
2989	sub size_request {	3531	sub size_request {
2990	(32, 8)	3532	my ($self) = @_;
		3533
		3534	if ($::CONN) {
		3535	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3536	if (my $tex = $::CONN->{texture}[$faceid]) {
		3537	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3538	} else {
		3539	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3540	$self->realloc;
		3541	});
		3542	}
		3543	}
		3544	}
		3545
		3546	($self->{size_w} || 8, $self->{size_h} || 8)
2991	}	3547	}
2992		3548
2993	sub update {	3549	sub update {
2994	my ($self) = @_;	3550	my ($self) = @_;
2995		3551
2996	return unless $self->{visible};	3552	return unless $self->{visible};
2997		3553
2998	$self->SUPER::update;	3554	$self->SUPER::update;
2999	}	3555	}
3000		3556
		3557	sub invoke_visibility_change {
		3558	my ($self) = @_;
		3559
		3560	$self->update_timer;
		3561
		3562	0
		3563	}
		3564
3001	sub _draw {	3565	sub _draw {
3002	my ($self) = @_;	3566	my ($self) = @_;
3003		3567
3004	return unless $::CONN;	3568	return unless $::CONN;
3005		3569
3006	my $face;	3570	$self->SUPER::_draw;
3007		3571
3008	if ($self->{frame}) {
3009	my $anim = $::CONN->{anim}[$self->{anim}];	3572	my $faceid = $::CONN->{faceid}[$self->{face}]
3010		3573	or return;
3011	$face = $anim->[ $self->{frame} % @$anim ]
3012	if $anim && @$anim;
3013	}
3014		3574
3015	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3575	my $tex = $::CONN->{texture}[$faceid];
3016		3576
3017	if ($tex) {	3577	if ($tex) {
3018	glEnable GL_TEXTURE_2D;	3578	glEnable GL_TEXTURE_2D;
3019	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3579	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3020	glColor 0, 0, 0, 1;	3580	glColor 0, 0, 0, 1;
…		…
3024	}	3584	}
3025		3585
3026	sub destroy {	3586	sub destroy {
3027	my ($self) = @_;	3587	my ($self) = @_;
3028		3588
3029	$self->{timer}->cancel	3589	(delete $self->{timer})->cancel
3030	if $self->{timer};	3590	if $self->{timer};
3031		3591
3032	$self->SUPER::destroy;	3592	$self->SUPER::destroy;
3033	}	3593	}
3034		3594
3035	#############################################################################	3595	#############################################################################
3036		3596
3037	package CFClient::UI::Buttonbar;	3597	package CFPlus::UI::Buttonbar;
3038		3598
3039	our @ISA = CFClient::UI::HBox::;	3599	our @ISA = CFPlus::UI::HBox::;
3040		3600
3041	# TODO: should actualyl wrap buttons and other goodies.	3601	# TODO: should actually wrap buttons and other goodies.
3042		3602
3043	#############################################################################	3603	#############################################################################
3044		3604
3045	package CFClient::UI::Menu;	3605	package CFPlus::UI::Menu;
3046		3606
3047	our @ISA = CFClient::UI::FancyFrame::;	3607	our @ISA = CFPlus::UI::Toplevel::;
3048		3608
3049	use CFClient::OpenGL;	3609	use CFPlus::OpenGL;
3050		3610
3051	sub new {	3611	sub new {
3052	my $class = shift;	3612	my $class = shift;
3053		3613
3054	my $self = $class->SUPER::new (	3614	my $self = $class->SUPER::new (
3055	items => [],	3615	items => [],
3056	z => 100,	3616	z => 100,
3057	@_,	3617	@_,
3058	);	3618	);
3059		3619
3060	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3620	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061		3621
3062	for my $item (@{ $self->{items} }) {	3622	for my $item (@{ $self->{items} }) {
3063	my ($widget, $cb, $tooltip) = @$item;	3623	my ($widget, $cb, $tooltip) = @$item;
3064		3624
3065	# handle various types of items, only text for now	3625	# handle various types of items, only text for now
3066	if (!ref $widget) {	3626	if (!ref $widget) {
		3627	if ($widget =~ /\t/) {
		3628	my ($left, $right) = split /\t/, $widget, 2;
		3629
3067	$widget = new CFClient::UI::Label	3630	$widget = new CFPlus::UI::HBox
3068	can_hover => 1,	3631	can_hover => 1,
3069	can_events => 1,	3632	can_events => 1,
		3633	tooltip => $tooltip,
		3634	children => [
		3635	(new CFPlus::UI::Label markup => $left, expand => 1),
		3636	(new CFPlus::UI::Label markup => $right, align => +1),
		3637	],
		3638	;
		3639
		3640	} else {
		3641	$widget = new CFPlus::UI::Label
		3642	can_hover => 1,
		3643	can_events => 1,
3070	markup => $widget,	3644	markup => $widget,
3071	tooltip => $tooltip	3645	tooltip => $tooltip;
		3646	}
3072	}	3647	}
3073		3648
3074	$self->{item}{$widget} = $item;	3649	$self->{item}{$widget} = $item;
3075		3650
3076	$self->{vbox}->add ($widget);	3651	$self->{vbox}->add ($widget);
…		…
3119	1	3694	1
3120	}	3695	}
3121		3696
3122	#############################################################################	3697	#############################################################################
3123		3698
3124	package CFClient::UI::Multiplexer;	3699	package CFPlus::UI::Multiplexer;
3125		3700
3126	our @ISA = CFClient::UI::Container::;	3701	our @ISA = CFPlus::UI::Container::;
3127		3702
3128	sub new {	3703	sub new {
3129	my $class = shift;	3704	my $class = shift;
3130		3705
3131	my $self = $class->SUPER::new (	3706	my $self = $class->SUPER::new (
…		…
3145		3720
3146	$self->{current} = $self->{children}[0]	3721	$self->{current} = $self->{children}[0]
3147	if @{ $self->{children} };	3722	if @{ $self->{children} };
3148	}	3723	}
3149		3724
		3725	sub get_current_page {
		3726	my ($self) = @_;
		3727
		3728	$self->{current}
		3729	}
		3730
3150	sub set_current_page {	3731	sub set_current_page {
3151	my ($self, $page_or_widget) = @_;	3732	my ($self, $page_or_widget) = @_;
3152		3733
3153	my $widget = ref $page_or_widget	3734	my $widget = ref $page_or_widget
3154	? $page_or_widget	3735	? $page_or_widget
…		…
3186	$self->{current}->draw;	3767	$self->{current}->draw;
3187	}	3768	}
3188		3769
3189	#############################################################################	3770	#############################################################################
3190		3771
3191	package CFClient::UI::Notebook;	3772	package CFPlus::UI::Notebook;
3192		3773
3193	our @ISA = CFClient::UI::VBox::;	3774	our @ISA = CFPlus::UI::VBox::;
3194		3775
3195	sub new {	3776	sub new {
3196	my $class = shift;	3777	my $class = shift;
3197		3778
3198	my $self = $class->SUPER::new (	3779	my $self = $class->SUPER::new (
3199	buttonbar => (new CFClient::UI::Buttonbar),	3780	buttonbar => (new CFPlus::UI::Buttonbar),
3200	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3781	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3201	# filter => # will be put between multiplexer and $self	3782	# filter => # will be put between multiplexer and $self
3202	@_,	3783	@_,
3203	);	3784	);
3204		3785
3205	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3786	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3209	}	3790	}
3210		3791
3211	sub add {	3792	sub add {
3212	my ($self, $title, $widget, $tooltip) = @_;	3793	my ($self, $title, $widget, $tooltip) = @_;
3213		3794
3214	Scalar::Util::weaken $self;	3795	CFPlus::weaken $self;
3215		3796
3216	$self->{buttonbar}->add (new CFClient::UI::Button	3797	$self->{buttonbar}->add (new CFPlus::UI::Button
3217	markup => $title,	3798	markup => $title,
3218	tooltip => $tooltip,	3799	tooltip => $tooltip,
3219	on_activate => sub { $self->set_current_page ($widget) },	3800	on_activate => sub { $self->set_current_page ($widget) },
3220	);	3801	);
3221		3802
3222	$self->{multiplexer}->add ($widget);	3803	$self->{multiplexer}->add ($widget);
3223	}	3804	}
3224		3805
		3806	sub get_current_page {
		3807	my ($self) = @_;
		3808
		3809	$self->{multiplexer}->get_current_page
		3810	}
		3811
3225	sub set_current_page {	3812	sub set_current_page {
3226	my ($self, $page) = @_;	3813	my ($self, $page) = @_;
3227		3814
3228	$self->{multiplexer}->set_current_page ($page);	3815	$self->{multiplexer}->set_current_page ($page);
3229	$self->emit (page_changed => $self->{multiplexer}{current});	3816	$self->emit (page_changed => $self->{multiplexer}{current});
3230	}	3817	}
3231		3818
3232	#############################################################################	3819	#############################################################################
3233		3820
3234	package CFClient::UI::Combobox;	3821	package CFPlus::UI::Selector;
3235		3822
3236	use utf8;	3823	use utf8;
3237		3824
3238	our @ISA = CFClient::UI::Button::;	3825	our @ISA = CFPlus::UI::Button::;
3239		3826
3240	sub new {	3827	sub new {
3241	my $class = shift;	3828	my $class = shift;
3242		3829
3243	my $self = $class->SUPER::new (	3830	my $self = $class->SUPER::new (
…		…
3260	my ($value, $title, $tooltip) = @$_;	3847	my ($value, $title, $tooltip) = @$_;
3261		3848
3262	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3849	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263	}	3850	}
3264		3851
3265	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3852	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266	}	3853	}
3267		3854
3268	sub _set_value {	3855	sub _set_value {
3269	my ($self, $value) = @_;	3856	my ($self, $value) = @_;
3270		3857
…		…
3285	$self->emit (changed => $value);	3872	$self->emit (changed => $value);
3286	}	3873	}
3287		3874
3288	#############################################################################	3875	#############################################################################
3289		3876
3290	package CFClient::UI::Statusbox;	3877	package CFPlus::UI::Statusbox;
3291		3878
3292	our @ISA = CFClient::UI::VBox::;	3879	our @ISA = CFPlus::UI::VBox::;
3293		3880
3294	sub new {	3881	sub new {
3295	my $class = shift;	3882	my $class = shift;
3296		3883
3297	my $self = $class->SUPER::new (	3884	my $self = $class->SUPER::new (
3298	fontsize => 0.8,	3885	fontsize => 0.8,
3299	@_,	3886	@_,
3300	);	3887	);
3301		3888
3302	Scalar::Util::weaken (my $this = $self);	3889	CFPlus::weaken (my $this = $self);
3303		3890
3304	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3891	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305		3892
3306	$self	3893	$self
3307	}	3894	}
…		…
3309	sub reorder {	3896	sub reorder {
3310	my ($self) = @_;	3897	my ($self) = @_;
3311	my $NOW = Time::HiRes::time;	3898	my $NOW = Time::HiRes::time;
3312		3899
3313	# freeze display when hovering over any label	3900	# freeze display when hovering over any label
3314	return if $CFClient::UI::TOOLTIP->{owner}	3901	return if $CFPlus::UI::TOOLTIP->{owner}
3315	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3902	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3316	values %{ $self->{item} };	3903	values %{ $self->{item} };
3317		3904
3318	while (my ($k, $v) = each %{ $self->{item} }) {	3905	while (my ($k, $v) = each %{ $self->{item} }) {
3319	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3906	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3320	}	3907	}
…		…
3341	for ($short) {	3928	for ($short) {
3342	s/^\s+//;	3929	s/^\s+//;
3343	s/\s+/ /g;	3930	s/\s+/ /g;
3344	}	3931	}
3345		3932
3346	new CFClient::UI::Label	3933	new CFPlus::UI::Label
3347	markup => $short,	3934	markup => $short,
3348	tooltip => $item->{tooltip},	3935	tooltip => $item->{tooltip},
3349	tooltip_font => $::FONT_PROP,	3936	tooltip_font => $::FONT_PROP,
3350	tooltip_width => 0.67,	3937	tooltip_width => 0.67,
3351	fontsize => $item->{fontsize} || $self->{fontsize},	3938	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3405	count => 1,	3992	count => 1,
3406	%arg,	3993	%arg,
3407	};	3994	};
3408	}	3995	}
3409		3996
		3997	$ROOT->on_refresh (reorder => sub {
3410	$self->reorder;	3998	$self->reorder;
		3999	});
3411	}	4000	}
3412		4001
3413	sub reconfigure {	4002	sub reconfigure {
3414	my ($self) = @_;	4003	my ($self) = @_;
3415		4004
…		…
3428	$self->SUPER::destroy;	4017	$self->SUPER::destroy;
3429	}	4018	}
3430		4019
3431	#############################################################################	4020	#############################################################################
3432		4021
3433	package CFClient::UI::Inventory;
3434
3435	our @ISA = CFClient::UI::ScrolledWindow::;
3436
3437	sub new {
3438	my $class = shift;
3439
3440	my $self = $class->SUPER::new (
3441	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3442	@_,
3443	);
3444
3445	$self
3446	}
3447
3448	sub set_items {
3449	my ($self, $items) = @_;
3450
3451	$self->{child}->clear;
3452	return unless $items;
3453
3454	my @items = sort {
3455	($a->{type} <=> $b->{type})
3456	or ($a->{name} cmp $b->{name})
3457	} @$items;
3458
3459	$self->{real_items} = \@items;
3460
3461	my $row = 0;
3462	for my $item (@items) {
3463	CFClient::Item::update_widgets $item;
3464
3465	$self->{child}->add (0, $row, $item->{face_widget});
3466	$self->{child}->add (1, $row, $item->{desc_widget});
3467	$self->{child}->add (2, $row, $item->{weight_widget});
3468
3469	$row++;
3470	}
3471	}
3472
3473	#############################################################################
3474
3475	package CFClient::UI::BindEditor;
3476
3477	our @ISA = CFClient::UI::FancyFrame::;
3478
3479	sub new {
3480	my $class = shift;
3481
3482	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484	$self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488	text => "start recording",
3489	tooltip => "Start/Stops recording of actions."
3490	."All subsequent actions after the recording started will be captured."
3491	."The actions are displayed after the record was stopped."
3492	."To bind the action you have to click on the 'Bind' button",
3493	on_activate => sub {
3494	unless ($self->{recording}) {
3495	$self->start;
3496	} else {
3497	$self->stop;
3498	}
3499	});
3500
3501	$vb->add (new CFClient::UI::Label text => "Actions:");
3502	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3505	$vb->add (my $hb = new CFClient::UI::HBox);
3506	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507	$hb->add (new CFClient::UI::Button
3508	text => "bind",
3509	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510	on_activate => sub {
3511	$self->ask_for_bind;
3512	});
3513
3514	$vb->add (my $hb = new CFClient::UI::HBox);
3515	$hb->add (new CFClient::UI::Button
3516	text => "ok",
3517	expand => 1,
3518	tooltip => "This closes the binding editor and saves the binding",
3519	on_activate => sub {
3520	$self->hide;
3521	$self->commit;
3522	});
3523
3524	$hb->add (new CFClient::UI::Button
3525	text => "cancel",
3526	expand => 1,
3527	tooltip => "This closes the binding editor without saving",
3528	on_activate => sub {
3529	$self->hide;
3530	$self->{binding_cancel}->()
3531	if $self->{binding_cancel};
3532	});
3533
3534	$self->update_binding_widgets;
3535
3536	$self
3537	}
3538
3539	sub cfg_bind {
3540	my ($self, $mod, $sym, $cmds) = @_;
3541	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542	::update_bindings ();
3543	}
3544
3545	sub cfg_unbind {
3546	my ($self, $mod, $sym, $cmds) = @_;
3547	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548	::update_bindings ();
3549	}
3550
3551	sub commit {
3552	my ($self) = @_;
3553	my ($mod, $sym, $cmds) = $self->get_binding;
3554	if ($sym != 0 && @$cmds > 0) {
3555	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556	."'. Don't forget 'Save Config'!");
3557	$self->{binding_change}->($mod, $sym, $cmds)
3558	if $self->{binding_change};
3559	} else {
3560	$::STATUSBOX->add ("No action bound, no key or action specified!");
3561	$self->{binding_cancel}->()
3562	if $self->{binding_cancel};
3563	}
3564	}
3565
3566	sub start {
3567	my ($self) = @_;
3568
3569	$self->{rec_btn}->set_text ("stop recording");
3570	$self->{recording} = 1;
3571	$self->clear_command_list;
3572	$::CONN->start_record if $::CONN;
3573	}
3574
3575	sub stop {
3576	my ($self) = @_;
3577
3578	$self->{rec_btn}->set_text ("start recording");
3579	$self->{recording} = 0;
3580
3581	my $rec;
3582	$rec = $::CONN->stop_record if $::CONN;
3583	return unless ref $rec eq 'ARRAY';
3584	$self->set_command_list ($rec);
3585	}
3586
3587
3588	sub ask_for_bind_and_commit {
3589	my ($self) = @_;
3590	$self->ask_for_bind (1);
3591	}
3592
3593	sub ask_for_bind {
3594	my ($self, $commit, $end_cb) = @_;
3595
3596	CFClient::Binder::open_binding_dialog (sub {
3597	my ($mod, $sym) = @_;
3598	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599	$self->update_binding_widgets;
3600	$self->commit if $commit;
3601	$end_cb->() if $end_cb;
3602	});
3603	}
3604
3605	# $mod and $sym are the modifiers and key symbol
3606	# $cmds is a array ref of strings (the commands)
3607	# $cb is the callback that is executed on OK
3608	# $ccb is the callback that is executed on CANCEL and
3609	# when the binding was unsuccessful on OK
3610	sub set_binding {
3611	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613	$self->clear_command_list;
3614	$self->{recording} = 0;
3615	$self->{rec_btn}->set_text ("start recording");
3616
3617	$self->{binding} = [$mod, $sym];
3618	$self->{commands} = $cmds;
3619
3620	$self->{binding_change} = $cb;
3621	$self->{binding_cancel} = $ccb;
3622
3623	$self->update_binding_widgets;
3624	}
3625
3626	# this is a shortcut method that asks for a binding
3627	# and then just binds it.
3628	sub do_quick_binding {
3629	my ($self, $cmds, $end_cb) = @_;
3630	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631	$self->ask_for_bind (1, $end_cb);
3632	}
3633
3634	sub update_binding_widgets {
3635	my ($self) = @_;
3636	my ($mod, $sym, $cmds) = $self->get_binding;
3637	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638	$self->set_command_list ($cmds);
3639	}
3640
3641	sub get_binding {
3642	my ($self) = @_;
3643	return (
3644	$self->{binding}->[0],
3645	$self->{binding}->[1],
3646	[ grep { defined $_ } @{$self->{commands}} ]
3647	);
3648	}
3649
3650	sub clear_command_list {
3651	my ($self) = @_;
3652	$self->{cmdbox}->clear ();
3653	}
3654
3655	sub set_command_list {
3656	my ($self, $cmds) = @_;
3657
3658	$self->{cmdbox}->clear ();
3659	$self->{commands} = $cmds;
3660
3661	my $idx = 0;
3662
3663	for (@$cmds) {
3664	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666	my $i = $idx;
3667	$hb->add (new CFClient::UI::Label text => $_);
3668	$hb->add (new CFClient::UI::Button
3669	text => "delete",
3670	tooltip => "Deletes the action from the record",
3671	on_activate => sub {
3672	$self->{cmdbox}->remove ($hb);
3673	$cmds->[$i] = undef;
3674	});
3675
3676
3677	$idx++
3678	}
3679	}
3680
3681	#############################################################################
3682
3683	package CFClient::UI::SpellList;
3684
3685	our @ISA = CFClient::UI::Table::;
3686
3687	sub new {
3688	my $class = shift;
3689
3690	my $self = $class->SUPER::new (
3691	binding => [],
3692	commands => [],
3693	@_,
3694	)
3695	}
3696
3697	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3698
3699	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3701	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709
3710	sub rebuild_spell_list {
3711	my ($self) = @_;
3712
3713	$CFClient::UI::ROOT->on_refresh ($self => sub {
3714	$self->clear;
3715
3716	return unless $::CONN;
3717
3718	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724	my $row = 0;
3725
3726	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727	my $spell = $self->{spell}{$_};
3728
3729	$row++;
3730
3731	my $spell_cb = sub {
3732	my ($widget, $ev) = @_;
3733
3734	if ($ev->{button} == 1) {
3735	$::CONN->user_send ("cast $spell->{name}");
3736	} elsif ($ev->{button} == 2) {
3737	$::CONN->user_send ("invoke $spell->{name}");
3738	} elsif ($ev->{button} == 3) {
3739	(new CFClient::UI::Menu
3740	items => [
3741	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743	],
3744	)->popup ($ev);
3745	} else {
3746	return 0;
3747	}
3748
3749	1
3750	};
3751
3752	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754	#TODO: add path info to tooltip
3755	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757	$self->add (0, $row, new CFClient::UI::Face
3758	face => $spell->{face},
3759	can_hover => 1,
3760	can_events => 1,
3761	tooltip => $tooltip,
3762	on_button_down => $spell_cb,
3763	);
3764
3765	$self->add (1, $row, new CFClient::UI::Label
3766	expand => 1,
3767	text => $spell->{name},
3768	can_hover => 1,
3769	can_events => 1,
3770	tooltip => $tooltip,
3771	on_button_down => $spell_cb,
3772	);
3773
3774	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778	}
3779	});
3780	}
3781
3782	sub add_spell {
3783	my ($self, $spell) = @_;
3784
3785	$self->{spell}->{$spell->{name}} = $spell;
3786	$self->rebuild_spell_list;
3787	}
3788
3789	sub remove_spell {
3790	my ($self, $spell) = @_;
3791
3792	delete $self->{spell}->{$spell->{name}};
3793	$self->rebuild_spell_list;
3794	}
3795
3796	sub clear_spells {
3797	my ($self) = @_;
3798
3799	$self->{spell} = {};
3800	$self->rebuild_spell_list;
3801	}
3802
3803	#############################################################################
3804
3805	package CFClient::UI::Root;	4022	package CFPlus::UI::Root;
3806		4023
3807	our @ISA = CFClient::UI::Container::;	4024	our @ISA = CFPlus::UI::Container::;
3808		4025
3809	use List::Util qw(min max);	4026	use List::Util qw(min max);
3810		4027
3811	use CFClient::OpenGL;	4028	use CFPlus::OpenGL;
3812		4029
3813	sub new {	4030	sub new {
3814	my $class = shift;	4031	my $class = shift;
3815		4032
3816	my $self = $class->SUPER::new (	4033	my $self = $class->SUPER::new (
3817	visible => 1,	4034	visible => 1,
3818	@_,	4035	@_,
3819	);	4036	);
3820		4037
3821	Scalar::Util::weaken ($self->{root} = $self);	4038	CFPlus::weaken ($self->{root} = $self);
3822		4039
3823	$self	4040	$self
3824	}	4041	}
3825		4042
3826	sub size_request {	4043	sub size_request {
…		…
3992	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4209	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993		4210
3994	$w = 0 if $w < 0;	4211	$w = 0 if $w < 0;
3995	$h = 0 if $h < 0;	4212	$h = 0 if $h < 0;
3996		4213
		4214	$w = max $widget->{min_w}, $w;
		4215	$h = max $widget->{min_h}, $h;
		4216
		4217	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4218	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4219
		4220	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4221	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4222
3997	$w = int $w + 0.5;	4223	$w = int $w + 0.5;
3998	$h = int $h + 0.5;	4224	$h = int $h + 0.5;
3999		4225
4000	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4226	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001	$widget->{old_w} = $widget->{w};	4227	$widget->{old_w} = $widget->{w};
…		…
4011		4237
4012	while ($self->{post_alloc_hook}) {	4238	while ($self->{post_alloc_hook}) {
4013	$_->()	4239	$_->()
4014	for values %{delete $self->{post_alloc_hook}};	4240	for values %{delete $self->{post_alloc_hook}};
4015	}	4241	}
4016
4017		4242
4018	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4243	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4019	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4244	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4020	glClear GL_COLOR_BUFFER_BIT;	4245	glClear GL_COLOR_BUFFER_BIT;
4021		4246
…		…
4024	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4249	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4025	glMatrixMode GL_MODELVIEW;	4250	glMatrixMode GL_MODELVIEW;
4026	glLoadIdentity;	4251	glLoadIdentity;
4027		4252
4028	{	4253	{
4029	package CFClient::UI::Base;	4254	package CFPlus::UI::Base;
4030		4255
4031	($draw_x, $draw_y, $draw_w, $draw_h) =	4256	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4032	(0, 0, $self->{w}, $self->{h});	4257	(0, 0, $self->{w}, $self->{h});
4033	}
4034		4258
4035	$self->_draw;	4259	$self->_draw;
		4260	}
4036	}	4261	}
4037		4262
4038	#############################################################################	4263	#############################################################################
4039		4264
4040	package CFClient::UI;	4265	package CFPlus::UI;
4041		4266
4042	$ROOT = new CFClient::UI::Root;	4267	$ROOT = new CFPlus::UI::Root;
4043	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4268	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4044		4269
4045	1	4270	1
4046		4271

Diff Legend

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