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

Diff Legend

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