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.394 by root, Sat Jul 21 13:54:03 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
		117	# mousewheel
		118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		120
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	121	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	122	$ev->{dy} = $shift ? 0 : $delta;
		123
		124	$GRAB->emit (mouse_wheel => $ev);
		125	} else {
		126	$GRAB->emit (button_down => $ev)
		127	}
		128	}
101	}	129	}
102		130
103	sub feed_sdl_button_up_event {	131	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	132	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		133
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	134	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		135
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	136	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		137
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	138	$GRAB->emit (button_up => $ev)
112	if $GRAB;	139	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		140
114	if (!$BUTTON_STATE) {	141	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	142	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	143	$grab->update if $grab;
117	$GRAB->update if $GRAB;	144	$GRAB->update if $GRAB;
118		145
		146	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	147	$TOOLTIP_WATCHER->cb->();
120	}	148	}
121	}	149	}
122		150
123	sub feed_sdl_motion_event {	151	sub feed_sdl_motion_event {
124	my ($ev) = @_;	152	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	153	my ($x, $y) = ($ev->{x}, $ev->{y});
126		154
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	155	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		156
129	if ($widget != $HOVER) {	157	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		158
132	$hover->update if $hover && $hover->{can_hover};	159	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	160	if $HOVER;
140	}	161	}
141		162
142	# convert position array to integers	163	# convert position array to integers
143	sub harmonize {	164	sub harmonize {
…		…
193	reconfigure_widgets;	214	reconfigure_widgets;
194	}	215	}
195		216
196	#############################################################################	217	#############################################################################
197		218
		219	package CFPlus::UI::Event;
		220
		221	sub xy {
		222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		223	}
		224
		225	#############################################################################
		226
198	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
199		228
200	use strict;	229	use strict;
201		230
202	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
203		232
204	sub new {	233	sub new {
205	my $class = shift;	234	my $class = shift;
206		235
207	my $self = bless {	236	my $self = bless {
…		…
212	h => undef,	241	h => undef,
213	can_events => 1,	242	can_events => 1,
214	@_	243	@_
215	}, $class;	244	}, $class;
216		245
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		247
219	for (keys %$self) {	248	for (keys %$self) {
220	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
222	}	251	}
223	}	252	}
224		253
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		259
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		262
234	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
239		268
240	sub destroy {	269	sub destroy {
241	my ($self) = @_;	270	my ($self) = @_;
242		271
243	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
244	%$self = ();	274	%$self = ();
245	}	275	}
246		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
247	sub show {	281	sub show {
248	my ($self) = @_;	282	my ($self) = @_;
249		283
250	return if $self->{parent};	284	return if $self->{parent};
251		285
252	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
253	}	287	}
254		288
255	sub set_visible {	289	sub set_visible {
256	my ($self) = @_;	290	my ($self) = @_;
257		291
…		…
278	delete $self->{root};	312	delete $self->{root};
279		313
280	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
282		316
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
285		319
286	$self->emit ("focus_out");	320	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
288	}	322	}
…		…
290	sub set_visibility {	324	sub set_visibility {
291	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
292		326
293	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
294		328
295	$visible ? $self->hide	329	$visible ? $self->show
296	: $self->show;	330	: $self->hide;
297	}	331	}
298		332
299	sub toggle_visibility {	333	sub toggle_visibility {
300	my ($self) = @_;	334	my ($self) = @_;
301		335
…		…
345	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
346		380
347	if ($self->{aspect}) {	381	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
349		383
350	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		386
353	# use alignment to adjust x, y	387	# use alignment to adjust x, y
354		388
355	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
397		431
398	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
399		433
400	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
401		435
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	439	}
406	}	440	}
407		441
408	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
409	sub coord2local {	443	sub coord2local {
410	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
411		445
		446	Carp::confess unless $self->{parent};#d#
		447
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	449	}
414		450
415	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
416	sub coord2global {	452	sub coord2global {
417	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
418		454
		455	Carp::confess unless $self->{parent};#d#
		456
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	458	}
421		459
422	sub invoke_focus_in {	460	sub invoke_focus_in {
423	my ($self) = @_;	461	my ($self) = @_;
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	}
		1106
		1107	#TODO# update range on size_allocate depending on child?
990		1108
991	sub add {	1109	sub add {
992	my ($self, $widget) = @_;	1110	my ($self, $widget) = @_;
993		1111
994	$self->{vp}->add ($self->{child} = $widget);	1112	$self->{vp}->add ($self->{child} = $widget);
995	}	1113	}
996		1114
		1115	sub update_slider {
		1116	my ($self) = @_;
		1117
		1118	my $child = ($self->{vp} or return)->child;
		1119
		1120	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1121	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1122
		1123	my $visible = $w1 > $w2;
		1124	if ($visible != $self->{hslider_visible}) {
		1125	$self->{hslider_visible} = $visible;
		1126	$visible ? $self->SUPER::add ($self->{hslider})
		1127	: $self->SUPER::remove ($self->{hslider});
		1128	}
		1129
		1130	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1131	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1132
		1133	my $visible = $h1 > $h2;
		1134	if ($visible != $self->{vslider_visible}) {
		1135	$self->{vslider_visible} = $visible;
		1136	$visible ? $self->SUPER::add ($self->{vslider})
		1137	: $self->SUPER::remove ($self->{vslider});
		1138	}
		1139	}
		1140
997	sub update {	1141	sub update {
998	my ($self) = @_;	1142	my ($self) = @_;
999		1143
		1144	$self->update_slider;
1000	$self->SUPER::update;	1145	$self->SUPER::update;
		1146	}
1001		1147
1002	# todo: overwrite size_allocate of child	1148	sub invoke_mouse_wheel {
1003	my $child = $self->{vp}->child;	1149	my ($self, $ev) = @_;
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1150
		1151	$self->{vslider}->emit (mouse_wheel => $ev)
		1152	if $ev->{dy};
		1153
		1154	$self->{hslider}->emit (mouse_wheel => $ev)
		1155	if $ev->{dx};
		1156
		1157	1
		1158	}
		1159
		1160	sub invoke_button_down {
		1161	my ($self, $ev, $x, $y) = @_;
		1162
		1163	if ($ev->{button} == 2) {
		1164	$self->grab_focus;
		1165
		1166	my $ox = $self->{vp}{view_x} + $ev->{x};
		1167	my $oy = $self->{vp}{view_y} + $ev->{y};
		1168
		1169	$self->{motion} = sub {
		1170	my ($ev, $x, $y) = @_;
		1171
		1172	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1173	$self->update;
		1174	};
		1175
		1176	return 1;
		1177	}
		1178
		1179	0
		1180	}
		1181
		1182	sub invoke_button_up {
		1183	my ($self, $ev, $x, $y) = @_;
		1184
		1185	if (delete $self->{motion}) {
		1186	return 1;
		1187	}
		1188
		1189	0
		1190	}
		1191
		1192	sub invoke_mouse_motion {
		1193	my ($self, $ev, $x, $y) = @_;
		1194
		1195	if ($self->{motion}) {
		1196	$self->{motion}->($ev, $x, $y);
		1197	return 1;
		1198	}
		1199
		1200	0
1005	}	1201	}
1006		1202
1007	sub invoke_size_allocate {	1203	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1204	my ($self, $w, $h) = @_;
1009		1205
1010	my $child = $self->{vp}->child;	1206	$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)	1207	$self->SUPER::invoke_size_allocate ($w, $h)
1014	}	1208	}
1015		1209
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018
1019	#############################################################################	1210	#############################################################################
1020		1211
1021	package CFClient::UI::Frame;	1212	package CFPlus::UI::Frame;
1022		1213
1023	our @ISA = CFClient::UI::Bin::;	1214	our @ISA = CFPlus::UI::Bin::;
1024		1215
1025	use CFClient::OpenGL;	1216	use CFPlus::OpenGL;
1026		1217
1027	sub new {	1218	sub new {
1028	my $class = shift;	1219	my $class = shift;
1029		1220
1030	$class->SUPER::new (	1221	$class->SUPER::new (
…		…
1056	$self->SUPER::_draw;	1247	$self->SUPER::_draw;
1057	}	1248	}
1058		1249
1059	#############################################################################	1250	#############################################################################
1060		1251
1061	package CFClient::UI::FancyFrame;	1252	package CFPlus::UI::FancyFrame;
1062		1253
1063	our @ISA = CFClient::UI::Bin::;	1254	our @ISA = CFPlus::UI::Bin::;
1064		1255
1065	use CFClient::OpenGL;	1256	use CFPlus::OpenGL;
		1257
		1258	sub new {
		1259	my ($class, %arg) = @_;
		1260
		1261	if ((exists $arg{label}) && !ref $arg{label}) {
		1262	$arg{label} = new CFPlus::UI::Label
		1263	align => 1,
		1264	valign => 0,
		1265	text => $arg{label},
		1266	fontsize => ($arg{border} || 0.8) * 0.75;
		1267	}
		1268
		1269	my $self = $class->SUPER::new (
		1270	# label => "",
		1271	fg => [0.6, 0.3, 0.1],
		1272	border => 0.8,
		1273	style => 'single',
		1274	%arg,
		1275	);
		1276
		1277	$self
		1278	}
		1279
		1280	sub add {
		1281	my ($self, @widgets) = @_;
		1282
		1283	$self->SUPER::add (@widgets);
		1284	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1285	}
		1286
		1287	sub border {
		1288	int $_[0]{border} * $::FONTSIZE
		1289	}
		1290
		1291	sub size_request {
		1292	my ($self) = @_;
		1293
		1294	($self->{label_w}, undef) = $self->{label}->size_request
		1295	if $self->{label};
		1296
		1297	my ($w, $h) = $self->SUPER::size_request;
		1298
		1299	(
		1300	$w + $self->border * 2,
		1301	$h + $self->border * 2,
		1302	)
		1303	}
		1304
		1305	sub invoke_size_allocate {
		1306	my ($self, $w, $h) = @_;
		1307
		1308	my $border = $self->border;
		1309
		1310	$w -= List::Util::max 0, $border * 2;
		1311	$h -= List::Util::max 0, $border * 2;
		1312
		1313	if (my $label = $self->{label}) {
		1314	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1315	$label->{h} = List::Util::min $h, $border;
		1316	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1317	}
		1318
		1319	$self->child->configure ($border, $border, $w, $h);
		1320
		1321	1
		1322	}
		1323
		1324	sub _draw {
		1325	my ($self) = @_;
		1326
		1327	my $child = $self->{children}[0];
		1328
		1329	my $border = $self->border;
		1330	my ($w, $h) = ($self->{w}, $self->{h});
		1331
		1332	$child->draw;
		1333
		1334	glColor @{$self->{fg}};
		1335	glBegin GL_LINE_STRIP;
		1336	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1337	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1338	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1339	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1340	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1341	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1342	glEnd;
		1343
		1344	if ($self->{label}) {
		1345	glTranslate $border * 2, 0;
		1346	$self->{label}->_draw;
		1347	}
		1348	}
		1349
		1350	#############################################################################
		1351
		1352	package CFPlus::UI::Toplevel;
		1353
		1354	our @ISA = CFPlus::UI::Bin::;
		1355
		1356	use CFPlus::OpenGL;
1066		1357
1067	my $bg =	1358	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1359	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1360	mipmap => 1, wrap => 1;
1070		1361
1071	my @border =	1362	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1363	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);	1364	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1365
		1366	my @icon =
		1367	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1368	qw(x1_move.png x1_resize.png);
1074		1369
1075	sub new {	1370	sub new {
1076	my ($class, %arg) = @_;	1371	my ($class, %arg) = @_;
1077		1372
1078	my $self = $class->SUPER::new (	1373	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1374	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1375	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1376	border => 0.6,
1082	can_events => 1,	1377	can_events => 1,
1083	min_w => 16,	1378	min_w => 64,
1084	min_h => 16,	1379	min_h => 32,
1085	%arg,	1380	%arg,
1086	);	1381	);
1087		1382
1088	$self->{title_widget} = new CFClient::UI::Label	1383	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1384	align => 0,
1090	valign => 1,	1385	valign => 1,
1091	text => $self->{title},	1386	text => $self->{title},
1092	fontsize => $self->{border},	1387	fontsize => $self->{border},
1093	if exists $self->{title};	1388	if exists $self->{title};
1094		1389
1095	if ($self->{has_close_button}) {	1390	if ($self->{has_close_button}) {
1096	$self->{close_button} =	1391	$self->{close_button} =
1097	new CFClient::UI::ImageButton	1392	new CFPlus::UI::ImageButton
1098	path => 'x1_close.png',	1393	path => 'x1_close.png',
1099	on_activate => sub { $self->hide };	1394	on_activate => sub { $self->emit ("delete") };
1100		1395
1101	$self->CFClient::UI::Container::add ($self->{close_button});	1396	$self->CFPlus::UI::Container::add ($self->{close_button});
1102	}	1397	}
1103		1398
1104	$self	1399	$self
1105	}	1400	}
1106		1401
1107	sub add {	1402	sub add {
1108	my ($self, @widgets) = @_;	1403	my ($self, @widgets) = @_;
1109		1404
1110	$self->SUPER::add (@widgets);	1405	$self->SUPER::add (@widgets);
1111	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1406	$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};	1407	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113	}	1408	}
1114		1409
1115	sub border {	1410	sub border {
1116	int $_[0]{border} * $::FONTSIZE	1411	int $_[0]{border} * $::FONTSIZE
1117	}	1412	}
…		…
1150	$self->child->configure ($border, $border, $w, $h);	1445	$self->child->configure ($border, $border, $w, $h);
1151		1446
1152	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1447	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153	if $self->{close_button};	1448	if $self->{close_button};
1154		1449
		1450	1
		1451	}
		1452
		1453	sub invoke_delete {
		1454	my ($self) = @_;
		1455
		1456	$self->hide;
		1457
1155	1	1458	1
1156	}	1459	}
1157		1460
1158	sub invoke_button_down {	1461	sub invoke_button_down {
1159	my ($self, $ev, $x, $y) = @_;	1462	my ($self, $ev, $x, $y) = @_;
…		…
1217	$self->{motion}->($ev, $x, $y) if $self->{motion};	1520	$self->{motion}->($ev, $x, $y) if $self->{motion};
1218		1521
1219	! ! $self->{motion}	1522	! ! $self->{motion}
1220	}	1523	}
1221		1524
		1525	sub invoke_visibility_change {
		1526	my ($self, $visible) = @_;
		1527
		1528	delete $self->{motion} unless $visible;
		1529
		1530	0
		1531	}
		1532
1222	sub _draw {	1533	sub _draw {
1223	my ($self) = @_;	1534	my ($self) = @_;
1224		1535
1225	my $child = $self->{children}[0];	1536	my $child = $self->{children}[0];
1226		1537
…		…
1231	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1542	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1232		1543
1233	my $border = $self->border;	1544	my $border = $self->border;
1234		1545
1235	glColor @{ $self->{border_bg} };	1546	glColor @{ $self->{border_bg} };
1236	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1547	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1237	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1548	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1238	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1549	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1239	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1550	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1551
		1552	# move
		1553	my $w2 = ($w - $border) * .5;
		1554	my $h2 = ($h - $border) * .5;
		1555	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1556	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1557	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1558
		1559	# resize
		1560	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1561	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1562	unless $self->{has_close_button};
		1563	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1564	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1240		1565
1241	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1566	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1242	glColor @{ $self->{bg} };	1567	glColor @{ $self->{bg} };
1243		1568
1244	# TODO: repeat texture not scale	1569	# TODO: repeat texture not scale
…		…
1263	if $self->{close_button};	1588	if $self->{close_button};
1264	}	1589	}
1265		1590
1266	#############################################################################	1591	#############################################################################
1267		1592
1268	package CFClient::UI::Table;	1593	package CFPlus::UI::Table;
1269		1594
1270	our @ISA = CFClient::UI::Base::;	1595	our @ISA = CFPlus::UI::Container::;
1271		1596
1272	use List::Util qw(max sum);	1597	use List::Util qw(max sum);
1273		1598
1274	use CFClient::OpenGL;	1599	use CFPlus::OpenGL;
1275		1600
1276	sub new {	1601	sub new {
1277	my $class = shift;	1602	my $class = shift;
1278		1603
1279	$class->SUPER::new (	1604	$class->SUPER::new (
1280	col_expand => [],	1605	col_expand => [],
		1606	row_expand => [],
1281	@_,	1607	@_,
1282	)	1608	)
1283	}	1609	}
1284		1610
1285	sub children {
1286	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287	}
1288
1289	sub add {	1611	sub add {
1290	my ($self, $x, $y, $child) = @_;	1612	my ($self, @widgets) = @_;
1291		1613
1292	$child->set_parent ($self);	1614	for my $child (@widgets) {
1293	$self->{children}[$y][$x] = $child;	1615	$child->{rowspan} ||= 1;
		1616	$child->{colspan} ||= 1;
		1617	}
1294		1618
1295	$self->realloc;	1619	$self->SUPER::add (@widgets);
1296	}	1620	}
1297		1621
1298	sub remove {	1622	sub add_at {
		1623	my $self = shift;
		1624
		1625	my @widgets;
		1626
		1627	while (@_) {
		1628	my ($col, $row, $child) = splice @_, 0, 3, ();
		1629
		1630	$child->{row} = $row;
		1631	$child->{col} = $col;
		1632
		1633	push @widgets, $child;
		1634	}
		1635
		1636	$self->add (@widgets);
		1637	}
		1638
		1639	sub get_wh {
1299	my ($self, $child) = @_;	1640	my ($self) = @_;
1300		1641
1301	# TODO: not yet implemented	1642	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		1643
1308	my @children = $self->children;	1644	my @children = $self->children;
1309	delete $self->{children};	1645
		1646	# first pass, columns
		1647	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1648	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1649
		1650	my $sw = sum @w[$c .. $c + $cs - 1];
		1651
		1652	if ($w > $sw) {
		1653	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1654	}
1310		1655	}
1311	for (@children) {
1312	delete $_->{parent};
1313	$_->hide;
1314	}
1315		1656
1316	$self->realloc;	1657	# second pass, rows
1317	}	1658	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)};	1659	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1332		1660
1333	$w[$x] = max $w[$x], $w;	1661	my $sh = sum @h[$r .. $r + $rs - 1];
1334	$h[$y] = max $h[$y], $h;	1662
		1663	if ($h > $sh) {
		1664	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1335	}	1665	}
1336	}	1666	}
1337		1667
1338	(\@w, \@h)	1668	(\@w, \@h)
1339	}	1669	}
…		…
1355	my ($ws, $hs) = $self->get_wh;	1685	my ($ws, $hs) = $self->get_wh;
1356		1686
1357	my $req_w = (sum @$ws) || 1;	1687	my $req_w = (sum @$ws) || 1;
1358	my $req_h = (sum @$hs) || 1;	1688	my $req_h = (sum @$hs) || 1;
1359		1689
1360	# TODO: nicer code && do row_expand	1690	# now linearly scale the rows/columns to the allocated size
1361	my @col_expand = @{$self->{col_expand}};	1691	my @col_expand = @{$self->{col_expand}};
1362	@col_expand = (1) x @$ws unless @col_expand;	1692	@col_expand = (1) x @$ws unless @col_expand;
1363	my $col_expand = (sum @col_expand) || 1;	1693	my $col_expand = (sum @col_expand) || 1;
1364		1694
1365	# linearly scale sizes
1366	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1695	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368		1696
1369	CFClient::UI::harmonize $ws;	1697	CFPlus::UI::harmonize $ws;
		1698
		1699	my @row_expand = @{$self->{row_expand}};
		1700	@row_expand = (1) x @$ws unless @row_expand;
		1701	my $row_expand = (sum @row_expand) || 1;
		1702
		1703	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1704
1370	CFClient::UI::harmonize $hs;	1705	CFPlus::UI::harmonize $hs;
1371		1706
1372	my $y;	1707	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1708	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1373		1709
1374	for my $r (0 .. $#{$self->{children}}) {	1710	for my $widget ($self->children) {
1375	my $row = $self->{children}[$r]	1711	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1376	or next;
1377		1712
1378	my $x = 0;	1713	$widget->configure (
1379	my $row_h = $hs->[$r];	1714	$x[$c], $y[$r],
		1715	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1380		1716	);
1381	for my $c (0 .. $#$row) {	1717	}
1382	my $col_w = $ws->[$c];
1383		1718
1384	if (my $widget = $row->[$c]) {	1719	1
1385	$widget->configure ($x, $y, $col_w, $row_h);	1720	}
1386	}
1387		1721
1388	$x += $col_w;	1722	#############################################################################
		1723
		1724	package CFPlus::UI::Fixed;
		1725
		1726	use List::Util qw(min max);
		1727
		1728	our @ISA = CFPlus::UI::Container::;
		1729
		1730	sub add {
		1731	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1732
		1733	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1734	$self->SUPER::add ($child);
		1735	}
		1736
		1737	sub _scale($$$) {
		1738	my ($mode, $val, $max) = @_;
		1739
		1740	$mode eq "abs" ? $val
		1741	: $mode eq "rel" ? $val * $max
		1742	: 0
		1743	}
		1744
		1745	sub size_request {
		1746	my ($self) = @_;
		1747
		1748	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1749
		1750	# determine overall size by querying abs widgets
		1751	for my $child ($self->visible_children) {
		1752	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1753
		1754	if ($pos eq "abs") {
		1755	$w = _scale $size, $w, $child->{req_w};
		1756	$h = _scale $size, $h, $child->{req_h};
		1757
		1758	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1759	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1389	}	1760	}
		1761	}
1390		1762
1391	$y += $row_h;	1763	my $W = $x2 - $x1;
		1764	my $H = $y2 - $y1;
		1765
		1766	# now layout remaining widgets
		1767	for my $child ($self->visible_children) {
		1768	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1769
		1770	if ($pos ne "abs") {
		1771	$x = _scale $pos, $x, $W;
		1772	$y = _scale $pos, $x, $H;
		1773	$w = _scale $size, $w, $child->{req_w};
		1774	$h = _scale $size, $h, $child->{req_h};
		1775
		1776	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1777	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1778	}
		1779	}
		1780
		1781	my $W = $x2 - $x1;
		1782	my $H = $y2 - $y1;
		1783
		1784	($W, $H)
		1785	}
		1786
		1787	sub invoke_size_allocate {
		1788	my ($self, $W, $H) = @_;
		1789
		1790	for my $child ($self->visible_children) {
		1791	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1792
		1793	$x = _scale $pos, $x, $W;
		1794	$y = _scale $pos, $x, $H;
		1795	$w = _scale $size, $w, $child->{req_w};
		1796	$h = _scale $size, $h, $child->{req_h};
		1797
		1798	$child->configure ($x, $y, $w, $h);
1392	}	1799	}
1393		1800
1394	1	1801	1
1395	}	1802	}
1396		1803
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	#############################################################################	1804	#############################################################################
1422		1805
1423	package CFClient::UI::Box;	1806	package CFPlus::UI::Box;
1424		1807
1425	our @ISA = CFClient::UI::Container::;	1808	our @ISA = CFPlus::UI::Container::;
1426		1809
1427	sub size_request {	1810	sub size_request {
1428	my ($self) = @_;	1811	my ($self) = @_;
1429		1812
1430	$self->{vertical}	1813	$self->{vertical}
…		…
1463	$req[$_] += $space * $children[$_]{expand}	1846	$req[$_] += $space * $children[$_]{expand}
1464	for 0 .. $#children;	1847	for 0 .. $#children;
1465	}	1848	}
1466	}	1849	}
1467		1850
1468	CFClient::UI::harmonize \@req;	1851	CFPlus::UI::harmonize \@req;
1469		1852
1470	my $pos = 0;	1853	my $pos = 0;
1471	for (0 .. $#children) {	1854	for (0 .. $#children) {
1472	my $alloc = $req[$_];	1855	my $alloc = $req[$_];
1473	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1856	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1478	1	1861	1
1479	}	1862	}
1480		1863
1481	#############################################################################	1864	#############################################################################
1482		1865
1483	package CFClient::UI::HBox;	1866	package CFPlus::UI::HBox;
1484		1867
1485	our @ISA = CFClient::UI::Box::;	1868	our @ISA = CFPlus::UI::Box::;
1486		1869
1487	sub new {	1870	sub new {
1488	my $class = shift;	1871	my $class = shift;
1489		1872
1490	$class->SUPER::new (	1873	$class->SUPER::new (
…		…
1493	)	1876	)
1494	}	1877	}
1495		1878
1496	#############################################################################	1879	#############################################################################
1497		1880
1498	package CFClient::UI::VBox;	1881	package CFPlus::UI::VBox;
1499		1882
1500	our @ISA = CFClient::UI::Box::;	1883	our @ISA = CFPlus::UI::Box::;
1501		1884
1502	sub new {	1885	sub new {
1503	my $class = shift;	1886	my $class = shift;
1504		1887
1505	$class->SUPER::new (	1888	$class->SUPER::new (
…		…
1508	)	1891	)
1509	}	1892	}
1510		1893
1511	#############################################################################	1894	#############################################################################
1512		1895
1513	package CFClient::UI::Label;	1896	package CFPlus::UI::Label;
1514		1897
1515	our @ISA = CFClient::UI::DrawBG::;	1898	our @ISA = CFPlus::UI::DrawBG::;
1516		1899
1517	use CFClient::OpenGL;	1900	use CFPlus::OpenGL;
1518		1901
1519	sub new {	1902	sub new {
1520	my ($class, %arg) = @_;	1903	my ($class, %arg) = @_;
1521		1904
1522	my $self = $class->SUPER::new (	1905	my $self = $class->SUPER::new (
…		…
1525	#active_bg => none	1908	#active_bg => none
1526	#font => default_font	1909	#font => default_font
1527	#text => initial text	1910	#text => initial text
1528	#markup => initial narkup	1911	#markup => initial narkup
1529	#max_w => maximum pixel width	1912	#max_w => maximum pixel width
		1913	#style => 0, # render flags
1530	ellipsise => 3, # end	1914	ellipsise => 3, # end
1531	layout => (new CFClient::Layout),	1915	layout => (new CFPlus::Layout),
1532	fontsize => 1,	1916	fontsize => 1,
1533	align => -1,	1917	align => -1,
1534	valign => -1,	1918	valign => -1,
1535	padding_x => 2,	1919	padding_x => 2,
1536	padding_y => 2,	1920	padding_y => 2,
1537	can_events => 0,	1921	can_events => 0,
1538	%arg	1922	%arg
1539	);	1923	);
1540		1924
1541	if (exists $self->{template}) {	1925	if (exists $self->{template}) {
1542	my $layout = new CFClient::Layout;	1926	my $layout = new CFPlus::Layout;
1543	$layout->set_text (delete $self->{template});	1927	$layout->set_text (delete $self->{template});
1544	$self->{template} = $layout;	1928	$self->{template} = $layout;
1545	}	1929	}
1546		1930
1547	if (exists $self->{markup}) {	1931	if (exists $self->{markup}) {
…		…
1551	}	1935	}
1552		1936
1553	$self	1937	$self
1554	}	1938	}
1555		1939
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 {	1940	sub update {
1567	my ($self) = @_;	1941	my ($self) = @_;
1568		1942
1569	delete $self->{texture};	1943	delete $self->{texture};
1570	$self->SUPER::update;	1944	$self->SUPER::update;
…		…
1581	my ($self, $text) = @_;	1955	my ($self, $text) = @_;
1582		1956
1583	return if $self->{text} eq "T$text";	1957	return if $self->{text} eq "T$text";
1584	$self->{text} = "T$text";	1958	$self->{text} = "T$text";
1585		1959
1586	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587	$self->{layout}->set_text ($text);	1960	$self->{layout}->set_text ($text);
1588		1961
1589	delete $self->{size_req};	1962	delete $self->{size_req};
1590	$self->realloc;	1963	$self->realloc;
1591	$self->update;	1964	$self->update;
…		…
1597	return if $self->{text} eq "M$markup";	1970	return if $self->{text} eq "M$markup";
1598	$self->{text} = "M$markup";	1971	$self->{text} = "M$markup";
1599		1972
1600	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1973	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601		1974
1602	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603	$self->{layout}->set_markup ($markup);	1975	$self->{layout}->set_markup ($markup);
1604		1976
1605	delete $self->{size_req};	1977	delete $self->{size_req};
1606	$self->realloc;	1978	$self->realloc;
1607	$self->update;	1979	$self->update;
…		…
1619		1991
1620	my ($w, $h) = $self->{layout}->size;	1992	my ($w, $h) = $self->{layout}->size;
1621		1993
1622	if (exists $self->{template}) {	1994	if (exists $self->{template}) {
1623	$self->{template}->set_font ($self->{font}) if $self->{font};	1995	$self->{template}->set_font ($self->{font}) if $self->{font};
		1996	$self->{template}->set_width ($self->{max_w} || -1);
1624	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1997	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625		1998
1626	my ($w2, $h2) = $self->{template}->size;	1999	my ($w2, $h2) = $self->{template}->size;
1627		2000
1628	$w = List::Util::max $w, $w2;	2001	$w = List::Util::max $w, $w2;
…		…
1652		2025
1653	sub set_fontsize {	2026	sub set_fontsize {
1654	my ($self, $fontsize) = @_;	2027	my ($self, $fontsize) = @_;
1655		2028
1656	$self->{fontsize} = $fontsize;	2029	$self->{fontsize} = $fontsize;
		2030	delete $self->{size_req};
1657	delete $self->{texture};	2031	delete $self->{texture};
1658		2032
1659	$self->realloc;	2033	$self->realloc;
1660	}	2034	}
1661		2035
1662	sub reconfigure {	2036	sub reconfigure {
1663	my ($self) = @_;	2037	my ($self) = @_;
1664		2038
1665	delete $self->{size_req};	2039	delete $self->{size_req};
		2040	delete $self->{texture};
1666		2041
1667	$self->SUPER::reconfigure;	2042	$self->SUPER::reconfigure;
1668	}	2043	}
1669		2044
1670	sub _draw {	2045	sub _draw {
1671	my ($self) = @_;	2046	my ($self) = @_;
1672		2047
1673	$self->SUPER::_draw; # draw background, if applicable	2048	$self->SUPER::_draw; # draw background, if applicable
1674		2049
1675	my $tex = $self->{texture} ||= do {	2050	my $size = $self->{texture} ||= do {
1676	$self->{layout}->set_foreground (@{$self->{fg}});	2051	$self->{layout}->set_foreground (@{$self->{fg}});
1677	$self->{layout}->set_font ($self->{font}) if $self->{font};	2052	$self->{layout}->set_font ($self->{font}) if $self->{font};
1678	$self->{layout}->set_width ($self->{w});	2053	$self->{layout}->set_width ($self->{w});
1679	$self->{layout}->set_ellipsise ($self->{ellipsise});	2054	$self->{layout}->set_ellipsise ($self->{ellipsise});
1680	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2055	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2056	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682		2057
1683	new_from_layout CFClient::Texture $self->{layout}	2058	[$self->{layout}->size]
1684	};	2059	};
1685		2060
1686	unless (exists $self->{ox}) {	2061	unless (exists $self->{ox}) {
1687	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2062	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2063	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689	: ($self->{w} - $tex->{w}) * 0.5);	2064	: ($self->{w} - $size->[0]) * 0.5);
1690		2065
1691	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2066	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2067	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693	: ($self->{h} - $tex->{h}) * 0.5);	2068	: ($self->{h} - $size->[1]) * 0.5);
1694	};	2069	};
1695		2070
1696	glEnable GL_TEXTURE_2D;
1697
1698	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2071	my $w = List::Util::min $self->{w} + 4, $size->[0];
1699	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2072	my $h = List::Util::min $self->{h} + 2, $size->[1];
1700		2073
1701	if ($tex->{format} == GL_ALPHA) {	2074	$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	}	2075	}
1712		2076
1713	#############################################################################	2077	#############################################################################
1714		2078
1715	package CFClient::UI::EntryBase;	2079	package CFPlus::UI::EntryBase;
1716		2080
1717	our @ISA = CFClient::UI::Label::;	2081	our @ISA = CFPlus::UI::Label::;
1718		2082
1719	use CFClient::OpenGL;	2083	use CFPlus::OpenGL;
1720		2084
1721	sub new {	2085	sub new {
1722	my $class = shift;	2086	my $class = shift;
1723		2087
1724	$class->SUPER::new (	2088	$class->SUPER::new (
…		…
1728	active_fg => [0, 0, 0],	2092	active_fg => [0, 0, 0],
1729	can_hover => 1,	2093	can_hover => 1,
1730	can_focus => 1,	2094	can_focus => 1,
1731	valign => 0,	2095	valign => 0,
1732	can_events => 1,	2096	can_events => 1,
		2097	ellipsise => 0,
1733	#text => ...	2098	#text => ...
1734	#hidden => "*",	2099	#hidden => "*",
1735	@_	2100	@_
1736	)	2101	)
1737	}	2102	}
…		…
1782	my $sym = $ev->{sym};	2147	my $sym = $ev->{sym};
1783	my $uni = $ev->{unicode};	2148	my $uni = $ev->{unicode};
1784		2149
1785	my $text = $self->get_text;	2150	my $text = $self->get_text;
1786		2151
		2152	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2153
1787	if ($uni == 8) {	2154	if ($uni == 8) {
1788	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2155	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789	} elsif ($uni == 127) {	2156	} elsif ($uni == 127) {
1790	substr $text, $self->{cursor}, 1, "";	2157	substr $text, $self->{cursor}, 1, "";
1791	} elsif ($sym == CFClient::SDLK_LEFT) {	2158	} elsif ($sym == CFPlus::SDLK_LEFT) {
1792	--$self->{cursor} if $self->{cursor};	2159	--$self->{cursor} if $self->{cursor};
1793	} elsif ($sym == CFClient::SDLK_RIGHT) {	2160	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1794	++$self->{cursor} if $self->{cursor} < length $self->{text};	2161	++$self->{cursor} if $self->{cursor} < length $self->{text};
1795	} elsif ($sym == CFClient::SDLK_HOME) {	2162	} elsif ($sym == CFPlus::SDLK_HOME) {
		2163	# what a hack
		2164	$self->{cursor} =
		2165	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2166	? length $1
		2167	: 0;
		2168	} elsif ($sym == CFPlus::SDLK_END) {
		2169	# uh, again
		2170	$self->{cursor} =
		2171	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2172	? $self->{cursor} + length $1
		2173	: length $self->{text};
		2174	} elsif ($uni == 21) { # ctrl-u
		2175	$text = "";
1796	$self->{cursor} = 0;	2176	$self->{cursor} = 0;
1797	} elsif ($sym == CFClient::SDLK_END) {
1798	$self->{cursor} = length $text;
1799	} elsif ($uni == 27) {	2177	} elsif ($uni == 27) {
1800	$self->emit ('escape');	2178	$self->emit ('escape');
1801	} elsif ($uni) {	2179	} elsif ($uni == 0x0d) {
		2180	substr $text, $self->{cursor}++, 0, "\012";
		2181	} elsif ($uni >= 0x20) {
1802	substr $text, $self->{cursor}++, 0, chr $uni;	2182	substr $text, $self->{cursor}++, 0, chr $uni;
1803	} else {	2183	} else {
1804	return 0;	2184	return 0;
1805	}	2185	}
1806		2186
1807	$self->_set_text ($text);	2187	$self->_set_text ($text);
1808		2188
1809	$self->realloc;	2189	$self->realloc;
		2190	$self->update;
1810		2191
1811	1	2192	1
1812	}	2193	}
1813		2194
1814	sub invoke_focus_in {	2195	sub invoke_focus_in {
…		…
1826		2207
1827	my $idx = $self->{layout}->xy_to_index ($x, $y);	2208	my $idx = $self->{layout}->xy_to_index ($x, $y);
1828		2209
1829	# byte-index to char-index	2210	# byte-index to char-index
1830	my $text = $self->{text};	2211	my $text = $self->{text};
1831	utf8::encode $text;	2212	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832	$self->{cursor} = length substr $text, 0, $idx;	2213	$self->{cursor} = length $text;
1833		2214
1834	$self->_set_text ($self->{text});	2215	$self->_set_text ($self->{text});
1835	$self->update;	2216	$self->update;
1836		2217
1837	1	2218	1
…		…
1876	utf8::encode $text;	2257	utf8::encode $text;
1877		2258
1878	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2259	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879	}	2260	}
1880		2261
1881	glColor @{$self->{fg}};
1882	glBegin GL_LINES;	2262	glBegin GL_LINES;
1883	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2263	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};	2264	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885	glEnd;	2265	glEnd;
1886	}	2266	}
1887	}	2267	}
1888		2268
		2269	#############################################################################
		2270
1889	package CFClient::UI::Entry;	2271	package CFPlus::UI::Entry;
1890		2272
1891	our @ISA = CFClient::UI::EntryBase::;	2273	our @ISA = CFPlus::UI::EntryBase::;
1892		2274
1893	use CFClient::OpenGL;	2275	use CFPlus::OpenGL;
1894		2276
1895	sub invoke_key_down {	2277	sub invoke_key_down {
1896	my ($self, $ev) = @_;	2278	my ($self, $ev) = @_;
1897		2279
1898	my $sym = $ev->{sym};	2280	my $sym = $ev->{sym};
1899		2281
1900	if ($sym == 13) {	2282	if ($ev->{uni} == 0x0d || $sym == 13) {
1901	unshift @{$self->{history}},	2283	unshift @{$self->{history}},
1902	my $txt = $self->get_text;	2284	my $txt = $self->get_text;
1903		2285
1904	$self->{history_pointer} = -1;	2286	$self->{history_pointer} = -1;
1905	$self->{history_saveback} = '';	2287	$self->{history_saveback} = '';
1906	$self->emit (activate => $txt);	2288	$self->emit (activate => $txt);
1907	$self->update;	2289	$self->update;
1908		2290
1909	} elsif ($sym == CFClient::SDLK_UP) {	2291	} elsif ($sym == CFPlus::SDLK_UP) {
1910	if ($self->{history_pointer} < 0) {	2292	if ($self->{history_pointer} < 0) {
1911	$self->{history_saveback} = $self->get_text;	2293	$self->{history_saveback} = $self->get_text;
1912	}	2294	}
1913	if (@{$self->{history} || []} > 0) {	2295	if (@{$self->{history} || []} > 0) {
1914	$self->{history_pointer}++;	2296	$self->{history_pointer}++;
…		…
1916	$self->{history_pointer} = @{$self->{history} || []} - 1;	2298	$self->{history_pointer} = @{$self->{history} || []} - 1;
1917	}	2299	}
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2300	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1919	}	2301	}
1920		2302
1921	} elsif ($sym == CFClient::SDLK_DOWN) {	2303	} elsif ($sym == CFPlus::SDLK_DOWN) {
1922	$self->{history_pointer}--;	2304	$self->{history_pointer}--;
1923	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2305	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924		2306
1925	if ($self->{history_pointer} >= 0) {	2307	if ($self->{history_pointer} >= 0) {
1926	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2308	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1935	1	2317	1
1936	}	2318	}
1937		2319
1938	#############################################################################	2320	#############################################################################
1939		2321
		2322	package CFPlus::UI::TextEdit;
		2323
		2324	our @ISA = CFPlus::UI::EntryBase::;
		2325
		2326	use CFPlus::OpenGL;
		2327
		2328	sub move_cursor_ver {
		2329	my ($self, $dy) = @_;
		2330
		2331	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2332
		2333	$y += $dy;
		2334
		2335	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2336	$self->{cursor} = $index;
		2337	delete $self->{cur_h};
		2338	$self->update;
		2339	return;
		2340	}
		2341	}
		2342
		2343	sub invoke_key_down {
		2344	my ($self, $ev) = @_;
		2345
		2346	my $sym = $ev->{sym};
		2347
		2348	if ($sym == CFPlus::SDLK_UP) {
		2349	$self->move_cursor_ver (-1);
		2350	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2351	$self->move_cursor_ver (+1);
		2352	} else {
		2353	return $self->SUPER::invoke_key_down ($ev)
		2354	}
		2355
		2356	1
		2357	}
		2358
		2359	#############################################################################
		2360
1940	package CFClient::UI::Button;	2361	package CFPlus::UI::Button;
1941		2362
1942	our @ISA = CFClient::UI::Label::;	2363	our @ISA = CFPlus::UI::Label::;
1943		2364
1944	use CFClient::OpenGL;	2365	use CFPlus::OpenGL;
1945		2366
1946	my @tex =	2367	my @tex =
1947	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2368	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948	qw(b1_button_active.png);	2369	qw(b1_button_inactive.png b1_button_active.png);
1949		2370
1950	sub new {	2371	sub new {
1951	my $class = shift;	2372	my $class = shift;
1952		2373
1953	$class->SUPER::new (	2374	$class->SUPER::new (
1954	padding_x => 4,	2375	padding_x => 4,
1955	padding_y => 4,	2376	padding_y => 4,
1956	fg => [1, 1, 1],	2377	fg => [1.0, 1.0, 1.0],
1957	active_fg => [0, 0, 1],	2378	active_fg => [0.8, 0.8, 0.8],
1958	can_hover => 1,	2379	can_hover => 1,
1959	align => 0,	2380	align => 0,
1960	valign => 0,	2381	valign => 0,
1961	can_events => 1,	2382	can_events => 1,
1962	@_	2383	@_
…		…
1980		2401
1981	glEnable GL_TEXTURE_2D;	2402	glEnable GL_TEXTURE_2D;
1982	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2403	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983	glColor 0, 0, 0, 1;	2404	glColor 0, 0, 0, 1;
1984		2405
		2406	my $tex = $tex[$GRAB == $self];
1985	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2407	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1986		2408
1987	glDisable GL_TEXTURE_2D;	2409	glDisable GL_TEXTURE_2D;
1988		2410
1989	$self->SUPER::_draw;	2411	$self->SUPER::_draw;
1990	}	2412	}
1991		2413
1992	#############################################################################	2414	#############################################################################
1993		2415
		2416	package CFPlus::UI::CheckBox;
		2417
		2418	our @ISA = CFPlus::UI::DrawBG::;
		2419
		2420	my @tex =
		2421	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2422	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2423
		2424	use CFPlus::OpenGL;
		2425
		2426	sub new {
		2427	my $class = shift;
		2428
		2429	$class->SUPER::new (
		2430	padding_x => 2,
		2431	padding_y => 2,
		2432	fg => [1, 1, 1],
		2433	active_fg => [1, 1, 0],
		2434	bg => [0, 0, 0, 0.2],
		2435	active_bg => [1, 1, 1, 0.5],
		2436	state => 0,
		2437	can_hover => 1,
		2438	@_
		2439	)
		2440	}
		2441
		2442	sub size_request {
		2443	my ($self) = @_;
		2444
		2445	(6) x 2
		2446	}
		2447
		2448	sub toggle {
		2449	my ($self) = @_;
		2450
		2451	$self->{state} = !$self->{state};
		2452	$self->emit (changed => $self->{state});
		2453	$self->update;
		2454	}
		2455
		2456	sub invoke_button_down {
		2457	my ($self, $ev, $x, $y) = @_;
		2458
		2459	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2460	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2461	$self->toggle;
		2462	} else {
		2463	return 0
		2464	}
		2465
		2466	1
		2467	}
		2468
		2469	sub _draw {
		2470	my ($self) = @_;
		2471
		2472	$self->SUPER::_draw;
		2473
		2474	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2475
		2476	my ($w, $h) = @$self{qw(w h)};
		2477
		2478	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2479
		2480	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2481
		2482	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2483
		2484	glEnable GL_TEXTURE_2D;
		2485	$tex->draw_quad_alpha (0, 0, $s, $s);
		2486	glDisable GL_TEXTURE_2D;
		2487	}
		2488
		2489	#############################################################################
		2490
		2491	package CFPlus::UI::Image;
		2492
		2493	our @ISA = CFPlus::UI::Base::;
		2494
		2495	use CFPlus::OpenGL;
		2496
		2497	our %texture_cache;
		2498
		2499	sub new {
		2500	my $class = shift;
		2501
		2502	my $self = $class->SUPER::new (
		2503	can_events => 0,
		2504	@_,
		2505	);
		2506
		2507	$self->{path} || $self->{tex}
		2508	or Carp::croak "'path' or 'tex' attributes required";
		2509
		2510	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2511	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2512
		2513	CFPlus::weaken $texture_cache{$self->{path}};
		2514
		2515	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2516
		2517	$self
		2518	}
		2519
		2520	sub STORABLE_freeze {
		2521	my ($self, $cloning) = @_;
		2522
		2523	$self->{path}
		2524	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2525
		2526	$self->{path}
		2527	}
		2528
		2529	sub STORABLE_attach {
		2530	my ($self, $cloning, $path) = @_;
		2531
		2532	$self->new (path => $path)
		2533	}
		2534
		2535	sub size_request {
		2536	my ($self) = @_;
		2537
		2538	($self->{tex}{w}, $self->{tex}{h})
		2539	}
		2540
		2541	sub _draw {
		2542	my ($self) = @_;
		2543
		2544	my $tex = $self->{tex};
		2545
		2546	my ($w, $h) = ($self->{w}, $self->{h});
		2547
		2548	if ($self->{rot90}) {
		2549	glRotate 90, 0, 0, 1;
		2550	glTranslate 0, -$self->{w}, 0;
		2551
		2552	($w, $h) = ($h, $w);
		2553	}
		2554
		2555	glEnable GL_TEXTURE_2D;
		2556	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2557
		2558	$tex->draw_quad (0, 0, $w, $h);
		2559
		2560	glDisable GL_TEXTURE_2D;
		2561	}
		2562
		2563	#############################################################################
		2564
1994	package CFClient::UI::ImageButton;	2565	package CFPlus::UI::ImageButton;
1995		2566
1996	our @ISA = CFClient::UI::Image::;	2567	our @ISA = CFPlus::UI::Image::;
1997		2568
1998	use CFClient::OpenGL;	2569	use CFPlus::OpenGL;
1999		2570
2000	my %textures;	2571	my %textures;
2001		2572
2002	sub new {	2573	sub new {
2003	my $class = shift;	2574	my $class = shift;
…		…
2025	1	2596	1
2026	}	2597	}
2027		2598
2028	#############################################################################	2599	#############################################################################
2029		2600
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;	2601	package CFPlus::UI::VGauge;
2099		2602
2100	our @ISA = CFClient::UI::Base::;	2603	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		2604
2161	use List::Util qw(min max);	2605	use List::Util qw(min max);
2162		2606
2163	use CFClient::OpenGL;	2607	use CFPlus::OpenGL;
2164		2608
2165	my %tex = (	2609	my %tex = (
2166	food => [	2610	food => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2611	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2612	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169	],	2613	],
2170	grace => [	2614	grace => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2615	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/	2616	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173	],	2617	],
2174	hp => [	2618	hp => [
2175	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2619	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2620	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177	],	2621	],
2178	mana => [	2622	mana => [
2179	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2623	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/	2624	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181	],	2625	],
2182	);	2626	);
2183		2627
2184	# eg. VGauge->new (gauge => 'food'), default gauge: food	2628	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2244	my $ycut1 = max 0, min 1, $ycut;	2688	my $ycut1 = max 0, min 1, $ycut;
2245	my $ycut2 = max 0, min 1, $ycut - 1;	2689	my $ycut2 = max 0, min 1, $ycut - 1;
2246		2690
2247	my $h1 = $self->{h} * (1 - $ycut1);	2691	my $h1 = $self->{h} * (1 - $ycut1);
2248	my $h2 = $self->{h} * (1 - $ycut2);	2692	my $h2 = $self->{h} * (1 - $ycut2);
		2693	my $h3 = $self->{h};
		2694
		2695	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249		2696
2250	glEnable GL_BLEND;	2697	glEnable GL_BLEND;
2251	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2698	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2699	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253	glEnable GL_TEXTURE_2D;	2700	glEnable GL_TEXTURE_2D;
…		…
2272		2719
2273	if ($t3) {	2720	if ($t3) {
2274	glBindTexture GL_TEXTURE_2D, $t3->{name};	2721	glBindTexture GL_TEXTURE_2D, $t3->{name};
2275	glBegin GL_QUADS;	2722	glBegin GL_QUADS;
2276	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2723	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2724	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2725	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2726	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280	glEnd;	2727	glEnd;
2281	}	2728	}
2282		2729
2283	glDisable GL_BLEND;	2730	glDisable GL_BLEND;
2284	glDisable GL_TEXTURE_2D;	2731	glDisable GL_TEXTURE_2D;
2285	}	2732	}
2286		2733
2287	#############################################################################	2734	#############################################################################
2288		2735
2289	package CFClient::UI::Gauge;	2736	package CFPlus::UI::Gauge;
2290		2737
2291	our @ISA = CFClient::UI::VBox::;	2738	our @ISA = CFPlus::UI::VBox::;
2292		2739
2293	sub new {	2740	sub new {
2294	my ($class, %arg) = @_;	2741	my ($class, %arg) = @_;
2295		2742
2296	my $self = $class->SUPER::new (	2743	my $self = $class->SUPER::new (
…		…
2298	can_hover => 1,	2745	can_hover => 1,
2299	can_events => 1,	2746	can_events => 1,
2300	%arg,	2747	%arg,
2301	);	2748	);
2302		2749
2303	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2750	$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);	2751	$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");	2752	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306		2753
2307	$self	2754	$self
2308	}	2755	}
2309		2756
2310	sub set_fontsize {	2757	sub set_fontsize {
…		…
2331	$self->{value}->set_text ($val);	2778	$self->{value}->set_text ($val);
2332	}	2779	}
2333		2780
2334	#############################################################################	2781	#############################################################################
2335		2782
2336	package CFClient::UI::Slider;	2783	package CFPlus::UI::Slider;
2337		2784
2338	use strict;	2785	use strict;
2339		2786
2340	use CFClient::OpenGL;	2787	use CFPlus::OpenGL;
2341		2788
2342	our @ISA = CFClient::UI::DrawBG::;	2789	our @ISA = CFPlus::UI::DrawBG::;
2343		2790
2344	my @tex =	2791	my @tex =
2345	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2792	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346	qw(s1_slider.png s1_slider_bg.png);	2793	qw(s1_slider.png s1_slider_bg.png);
2347		2794
2348	sub new {	2795	sub new {
2349	my $class = shift;	2796	my $class = shift;
2350		2797
…		…
2439	}	2886	}
2440		2887
2441	1	2888	1
2442	}	2889	}
2443		2890
		2891	sub invoke_mouse_wheel {
		2892	my ($self, $ev) = @_;
		2893
		2894	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2895
		2896	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2897
		2898	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2899
		2900	! ! $delta
		2901	}
		2902
2444	sub update {	2903	sub update {
2445	my ($self) = @_;	2904	my ($self) = @_;
2446		2905
2447	delete $self->{knob_w};	2906	delete $self->{knob_w};
2448	$self->SUPER::update;	2907	$self->SUPER::update;
…		…
2495	glDisable GL_TEXTURE_2D;	2954	glDisable GL_TEXTURE_2D;
2496	}	2955	}
2497		2956
2498	#############################################################################	2957	#############################################################################
2499		2958
2500	package CFClient::UI::ValSlider;	2959	package CFPlus::UI::ValSlider;
2501		2960
2502	our @ISA = CFClient::UI::HBox::;	2961	our @ISA = CFPlus::UI::HBox::;
2503		2962
2504	sub new {	2963	sub new {
2505	my ($class, %arg) = @_;	2964	my ($class, %arg) = @_;
2506		2965
2507	my $range = delete $arg{range};	2966	my $range = delete $arg{range};
2508		2967
2509	my $self = $class->SUPER::new (	2968	my $self = $class->SUPER::new (
2510	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2969	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2970	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512	to_value => sub { shift },	2971	to_value => sub { shift },
2513	from_value => sub { shift },	2972	from_value => sub { shift },
2514	%arg,	2973	%arg,
2515	);	2974	);
2516		2975
…		…
2536	sub set_range { shift->{slider}->set_range (@_) }	2995	sub set_range { shift->{slider}->set_range (@_) }
2537	sub set_value { shift->{slider}->set_value (@_) }	2996	sub set_value { shift->{slider}->set_value (@_) }
2538		2997
2539	#############################################################################	2998	#############################################################################
2540		2999
2541	package CFClient::UI::TextScroller;	3000	package CFPlus::UI::TextScroller;
2542		3001
2543	our @ISA = CFClient::UI::HBox::;	3002	our @ISA = CFPlus::UI::HBox::;
2544		3003
2545	use CFClient::OpenGL;	3004	use CFPlus::OpenGL;
2546		3005
2547	sub new {	3006	sub new {
2548	my $class = shift;	3007	my $class = shift;
2549		3008
2550	my $self = $class->SUPER::new (	3009	my $self = $class->SUPER::new (
2551	fontsize => 1,	3010	fontsize => 1,
2552	can_events => 0,	3011	can_events => 1,
2553	indent => 0,	3012	indent => 0,
2554	#font => default_font	3013	#font => default_font
2555	@_,	3014	@_,
2556		3015
2557	layout => (new CFClient::Layout 1),	3016	layout => (new CFPlus::Layout),
2558	par => [],	3017	par => [],
		3018	max_par => 0,
2559	height => 0,	3019	height => 0,
2560	children => [	3020	children => [
2561	(new CFClient::UI::Empty expand => 1),	3021	(new CFPlus::UI::Empty expand => 1),
2562	(new CFClient::UI::Slider vertical => 1),	3022	(new CFPlus::UI::Slider vertical => 1),
2563	],	3023	],
2564	);	3024	);
2565		3025
2566	$self->{children}[1]->connect (changed => sub { $self->update });	3026	$self->{children}[1]->connect (changed => sub { $self->update });
2567		3027
…		…
2597		3057
2598	$self->reflow;	3058	$self->reflow;
2599		3059
2600	local $self->{children} = [$empty, $slider];	3060	local $self->{children} = [$empty, $slider];
2601	$self->SUPER::invoke_size_allocate ($w, $h)	3061	$self->SUPER::invoke_size_allocate ($w, $h)
		3062	}
		3063
		3064	sub invoke_mouse_wheel {
		3065	my ($self, $ev) = @_;
		3066
		3067	return 0 unless $ev->{dy}; # only vertical movements
		3068
		3069	$self->{children}[1]->emit (mouse_wheel => $ev);
		3070
		3071	1
2602	}	3072	}
2603		3073
2604	sub get_layout {	3074	sub get_layout {
2605	my ($self, $para) = @_;	3075	my ($self, $para) = @_;
2606		3076
…		…
2634		3104
2635	# todo: base offset on lines or so, not on pixels	3105	# todo: base offset on lines or so, not on pixels
2636	$self->{children}[1]->set_value ($offset);	3106	$self->{children}[1]->set_value ($offset);
2637	}	3107	}
2638		3108
		3109	sub current_paragraph {
		3110	my ($self) = @_;
		3111
		3112	$self->{top_paragraph} - 1
		3113	}
		3114
		3115	sub scroll_to {
		3116	my ($self, $para) = @_;
		3117
		3118	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3119
		3120	$self->{scroll_to} = $para;
		3121	$self->update;
		3122	}
		3123
2639	sub clear {	3124	sub clear {
2640	my ($self) = @_;	3125	my ($self) = @_;
2641		3126
2642	my (undef, undef, @other) = @{ $self->{children} };	3127	my (undef, undef, @other) = @{ $self->{children} };
2643	$self->remove ($_) for @other;	3128	$self->remove ($_) for @other;
…		…
2646	$self->{height} = 0;	3131	$self->{height} = 0;
2647	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3132	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648	}	3133	}
2649		3134
2650	sub add_paragraph {	3135	sub add_paragraph {
2651	my ($self, $color, $para, $indent) = @_;	3136	my $self = shift;
2652		3137
2653	my ($text, @w) = ref $para ? @$para : $para;	3138	for my $para (@_) {
2654
2655	$para = {	3139	$para = {
		3140	fg => [1, 1, 1, 1],
		3141	indent => 0,
		3142	markup => "",
		3143	widget => [],
		3144	ref $para ? %$para : (markup => $para),
2656	w => 1e10,	3145	w => 1e10,
2657	wrapped => 1,	3146	wrapped => 1,
2658	fg => $color,
2659	indent => $indent,
2660	markup => $text,
2661	widget => \@w,
2662	};	3147	};
2663		3148
2664	$self->add (@w) if @w;	3149	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665	push @{$self->{par}}, $para;	3150	push @{$self->{par}}, $para;
		3151	}
		3152
		3153	if (my $max = $self->{max_par}) {
		3154	shift @{$self->{par}} while @{$self->{par}} > $max;
		3155	}
2666		3156
2667	$self->{need_reflow}++;	3157	$self->{need_reflow}++;
2668	$self->update;	3158	$self->update;
2669	}	3159	}
2670		3160
2671	sub scroll_to_bottom {	3161	sub scroll_to_bottom {
2672	my ($self) = @_;	3162	my ($self) = @_;
2673		3163
2674	$self->{scroll_to_bottom} = 1;	3164	$self->{scroll_to} = $#{$self->{par}};
2675	$self->update;	3165	$self->update;
2676	}	3166	}
2677		3167
		3168	sub force_uptodate {
		3169	my ($self) = @_;
		3170
		3171	if (delete $self->{need_reflow}) {
		3172	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3173
		3174	my $height = 0;
		3175
		3176	for my $para (@{$self->{par}}) {
		3177	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3178	my $layout = $self->get_layout ($para);
		3179	my ($w, $h) = $layout->size;
		3180
		3181	$para->{w} = $w + $para->{indent};
		3182	$para->{h} = $h;
		3183	$para->{wrapped} = $layout->has_wrapped;
		3184	}
		3185
		3186	$para->{y} = $height;
		3187	$height += $para->{h};
		3188	}
		3189
		3190	$self->{height} = $height;
		3191	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3192
		3193	delete $self->{texture};
		3194	}
		3195
		3196	if (my $paridx = delete $self->{scroll_to}) {
		3197	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3198	}
		3199	}
		3200
2678	sub update {	3201	sub update {
2679	my ($self) = @_;	3202	my ($self) = @_;
2680		3203
2681	$self->SUPER::update;	3204	$self->SUPER::update;
2682		3205
2683	return unless $self->{h} > 0;	3206	return unless $self->{h} > 0;
2684		3207
2685	delete $self->{texture};	3208	delete $self->{texture};
2686		3209
2687	$ROOT->on_post_alloc ($self => sub {	3210	$ROOT->on_post_alloc ($self => sub {
		3211	$self->force_uptodate;
		3212
2688	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3213	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689		3214
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 {	3215	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718	glClearColor 0, 0, 0, 0;	3216	glClearColor 0, 0, 0, 0;
2719	glClear GL_COLOR_BUFFER_BIT;	3217	glClear GL_COLOR_BUFFER_BIT;
2720		3218
		3219	package CFPlus::UI::Base;
		3220	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3221	(0, 0, $self->{w}, $self->{h});
		3222
		3223	my $top = int $self->{children}[1]{range}[0];
		3224
		3225	my $paridx = 0;
		3226	my $top_paragraph;
2721	my $top = int $self->{children}[1]{range}[0];	3227	my $top = int $self->{children}[1]{range}[0];
2722		3228
2723	my $y0 = $top;	3229	my $y0 = $top;
2724	my $y1 = $top + $H;	3230	my $y1 = $top + $H;
2725		3231
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}}) {	3232	for my $para (@{$self->{par}}) {
2733	my $h = $para->{h};	3233	my $h = $para->{h};
		3234	my $y = $para->{y};
2734		3235
2735	if ($y0 < $y + $h && $y < $y1) {	3236	if ($y0 < $y + $h && $y < $y1) {
2736
2737	my $layout = $self->get_layout ($para);	3237	my $layout = $self->get_layout ($para);
2738		3238
2739	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741	glRasterPos $para->{indent}, $y - $y0;	3239	$layout->render ($para->{indent}, $y - $y0);
2742	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743		3240
2744	if (my @w = @{ $para->{widget} }) {	3241	if (my @w = @{ $para->{widget} }) {
2745	my @s = $layout->get_shapes;	3242	my @s = $layout->get_shapes;
2746		3243
2747	for (@w) {	3244	for (@w) {
…		…
2753	$_->draw;	3250	$_->draw;
2754	}	3251	}
2755	}	3252	}
2756	}	3253	}
2757		3254
2758	$y += $h;	3255	$paridx++;
		3256	$top_paragraph ||= $paridx if $y >= $top;
2759	}	3257	}
2760		3258
2761	glDisable GL_BLEND;	3259	$self->{top_paragraph} = $top_paragraph;
2762	};	3260	};
2763	});	3261	});
2764	}	3262	}
2765		3263
2766	sub reconfigure {	3264	sub reconfigure {
…		…
2784	$self->{children}[1]->draw;	3282	$self->{children}[1]->draw;
2785	}	3283	}
2786		3284
2787	#############################################################################	3285	#############################################################################
2788		3286
2789	package CFClient::UI::Animator;	3287	package CFPlus::UI::Animator;
2790		3288
2791	use CFClient::OpenGL;	3289	use CFPlus::OpenGL;
2792		3290
2793	our @ISA = CFClient::UI::Bin::;	3291	our @ISA = CFPlus::UI::Bin::;
2794		3292
2795	sub moveto {	3293	sub moveto {
2796	my ($self, $x, $y) = @_;	3294	my ($self, $x, $y) = @_;
2797		3295
2798	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3296	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2826	glPopMatrix;	3324	glPopMatrix;
2827	}	3325	}
2828		3326
2829	#############################################################################	3327	#############################################################################
2830		3328
2831	package CFClient::UI::Flopper;	3329	package CFPlus::UI::Flopper;
2832		3330
2833	our @ISA = CFClient::UI::Button::;	3331	our @ISA = CFPlus::UI::Button::;
2834		3332
2835	sub new {	3333	sub new {
2836	my $class = shift;	3334	my $class = shift;
2837		3335
2838	my $self = $class->SUPER::new (	3336	my $self = $class->SUPER::new (
…		…
2850	$self->{other}->toggle_visibility;	3348	$self->{other}->toggle_visibility;
2851	}	3349	}
2852		3350
2853	#############################################################################	3351	#############################################################################
2854		3352
2855	package CFClient::UI::Tooltip;	3353	package CFPlus::UI::Tooltip;
2856		3354
2857	our @ISA = CFClient::UI::Bin::;	3355	our @ISA = CFPlus::UI::Bin::;
2858		3356
2859	use CFClient::OpenGL;	3357	use CFPlus::OpenGL;
2860		3358
2861	sub new {	3359	sub new {
2862	my $class = shift;	3360	my $class = shift;
2863		3361
2864	$class->SUPER::new (	3362	$class->SUPER::new (
…		…
2867	)	3365	)
2868	}	3366	}
2869		3367
2870	sub set_tooltip_from {	3368	sub set_tooltip_from {
2871	my ($self, $widget) = @_;	3369	my ($self, $widget) = @_;
		3370
		3371	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3372	if $widget->{tooltip} =~ /^#(.*)$/;
2872		3373
2873	my $tooltip = $widget->{tooltip};	3374	my $tooltip = $widget->{tooltip};
2874		3375
2875	if ($ENV{CFPLUS_DEBUG} & 2) {	3376	if ($ENV{CFPLUS_DEBUG} & 2) {
2876	$tooltip .= "\n\n" . (ref $widget) . "\n"	3377	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2880	}	3381	}
2881		3382
2882	$tooltip =~ s/^\n+//;	3383	$tooltip =~ s/^\n+//;
2883	$tooltip =~ s/\n+$//;	3384	$tooltip =~ s/\n+$//;
2884		3385
2885	$self->add (new CFClient::UI::Label	3386	$self->add (new CFPlus::UI::Label
2886	markup => $tooltip,	3387	markup => $tooltip,
2887	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3388	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888	fontsize => 0.8,	3389	fontsize => 0.8,
2889	fg => [0, 0, 0, 1],	3390	style => 1, # FLAG_INVERSE
2890	ellipsise => 0,	3391	ellipsise => 0,
2891	font => ($widget->{tooltip_font} || $::FONT_PROP),	3392	font => ($widget->{tooltip_font} || $::FONT_PROP),
2892	);	3393	);
2893	}	3394	}
2894		3395
…		…
2913		3414
2914	$self->{root}->on_post_alloc ("move_$self" => sub {	3415	$self->{root}->on_post_alloc ("move_$self" => sub {
2915	my $widget = $self->{owner}	3416	my $widget = $self->{owner}
2916	or return;	3417	or return;
2917		3418
		3419	if ($widget->{visible}) {
2918	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3420	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919		3421
2920	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3422	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921	if $x + $self->{w} > $self->{root}{w};	3423	if $x + $self->{w} > $self->{root}{w};
2922		3424
2923	$self->move_abs ($x, $y);	3425	$self->move_abs ($x, $y);
		3426	} else {
		3427	$self->hide;
		3428	}
2924	});	3429	});
2925	}	3430	}
2926		3431
2927	sub _draw {	3432	sub _draw {
2928	my ($self) = @_;	3433	my ($self) = @_;
…		…
2952	$self->SUPER::_draw;	3457	$self->SUPER::_draw;
2953	}	3458	}
2954		3459
2955	#############################################################################	3460	#############################################################################
2956		3461
2957	package CFClient::UI::Face;	3462	package CFPlus::UI::Face;
2958		3463
2959	our @ISA = CFClient::UI::Base::;	3464	our @ISA = CFPlus::UI::DrawBG::;
2960		3465
2961	use CFClient::OpenGL;	3466	use CFPlus::OpenGL;
2962		3467
2963	sub new {	3468	sub new {
2964	my $class = shift;	3469	my $class = shift;
2965		3470
2966	my $self = $class->SUPER::new (	3471	my $self = $class->SUPER::new (
		3472	size_w => 32,
		3473	size_h => 8,
2967	aspect => 1,	3474	aspect => 1,
2968	can_events => 0,	3475	can_events => 0,
2969	@_,	3476	@_,
2970	);	3477	);
2971		3478
2972	if ($self->{anim} && $self->{animspeed}) {	3479	if ($self->{anim} && $self->{animspeed}) {
2973	Scalar::Util::weaken (my $widget = $self);	3480	CFPlus::weaken (my $widget = $self);
2974		3481
		3482	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3483	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2975	$self->{timer} = Event->timer (	3484	$self->{timer} = Event->timer (
2976	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2977	hard => 1,	3485	parked => 1,
2978	interval => $self->{animspeed},
2979	cb => sub {	3486	cb => sub {
		3487	return unless $::CONN && $widget;
		3488
2980	++$widget->{frame};	3489	++$widget->{frame};
		3490	$widget->update_face;
2981	$widget->update;	3491	$widget->update;
		3492
		3493	$widget->update_timer;
2982	},	3494	},
2983	);	3495	);
		3496
		3497	$self->update_face;
		3498	$self->update_timer;
2984	}	3499	}
2985		3500
2986	$self	3501	$self
2987	}	3502	}
2988		3503
		3504	sub update_timer {
		3505	my ($self) = @_;
		3506
		3507	return unless $self->{timer};
		3508
		3509	if ($self->{visible}) {
		3510	$self->{timer}->at (
		3511	$self->{anim_start}
		3512	+ $self->{animspeed}
		3513	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3514	);
		3515	$self->{timer}->start;
		3516	} else {
		3517	$self->{timer}->stop;
		3518	}
		3519	}
		3520
		3521	sub update_face {
		3522	my ($self) = @_;
		3523
		3524	return unless $::CONN;
		3525
		3526	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3527	if ($anim && @$anim) {
		3528	delete $self->{wait_face};
		3529	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3530	}
		3531	}
		3532	}
		3533
2989	sub size_request {	3534	sub size_request {
2990	(32, 8)	3535	my ($self) = @_;
		3536
		3537	if ($::CONN) {
		3538	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3539	if (my $tex = $::CONN->{texture}[$faceid]) {
		3540	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3541	} else {
		3542	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3543	$self->realloc;
		3544	});
		3545	}
		3546	}
		3547	}
		3548
		3549	($self->{size_w} || 8, $self->{size_h} || 8)
2991	}	3550	}
2992		3551
2993	sub update {	3552	sub update {
2994	my ($self) = @_;	3553	my ($self) = @_;
2995		3554
2996	return unless $self->{visible};	3555	return unless $self->{visible};
2997		3556
2998	$self->SUPER::update;	3557	$self->SUPER::update;
2999	}	3558	}
3000		3559
		3560	sub invoke_visibility_change {
		3561	my ($self) = @_;
		3562
		3563	$self->update_timer;
		3564
		3565	0
		3566	}
		3567
3001	sub _draw {	3568	sub _draw {
3002	my ($self) = @_;	3569	my ($self) = @_;
3003		3570
3004	return unless $::CONN;	3571	return unless $::CONN;
3005		3572
3006	my $face;	3573	$self->SUPER::_draw;
3007		3574
3008	if ($self->{frame}) {
3009	my $anim = $::CONN->{anim}[$self->{anim}];	3575	my $faceid = $::CONN->{faceid}[$self->{face}]
3010		3576	or return;
3011	$face = $anim->[ $self->{frame} % @$anim ]
3012	if $anim && @$anim;
3013	}
3014		3577
3015	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3578	my $tex = $::CONN->{texture}[$faceid];
3016		3579
3017	if ($tex) {	3580	if ($tex) {
3018	glEnable GL_TEXTURE_2D;	3581	glEnable GL_TEXTURE_2D;
3019	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3582	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3020	glColor 0, 0, 0, 1;	3583	glColor 0, 0, 0, 1;
…		…
3024	}	3587	}
3025		3588
3026	sub destroy {	3589	sub destroy {
3027	my ($self) = @_;	3590	my ($self) = @_;
3028		3591
3029	$self->{timer}->cancel	3592	(delete $self->{timer})->cancel
3030	if $self->{timer};	3593	if $self->{timer};
3031		3594
3032	$self->SUPER::destroy;	3595	$self->SUPER::destroy;
3033	}	3596	}
3034		3597
3035	#############################################################################	3598	#############################################################################
3036		3599
3037	package CFClient::UI::Buttonbar;	3600	package CFPlus::UI::Buttonbar;
3038		3601
3039	our @ISA = CFClient::UI::HBox::;	3602	our @ISA = CFPlus::UI::HBox::;
3040		3603
3041	# TODO: should actualyl wrap buttons and other goodies.	3604	# TODO: should actually wrap buttons and other goodies.
3042		3605
3043	#############################################################################	3606	#############################################################################
3044		3607
3045	package CFClient::UI::Menu;	3608	package CFPlus::UI::Menu;
3046		3609
3047	our @ISA = CFClient::UI::FancyFrame::;	3610	our @ISA = CFPlus::UI::Toplevel::;
3048		3611
3049	use CFClient::OpenGL;	3612	use CFPlus::OpenGL;
3050		3613
3051	sub new {	3614	sub new {
3052	my $class = shift;	3615	my $class = shift;
3053		3616
3054	my $self = $class->SUPER::new (	3617	my $self = $class->SUPER::new (
3055	items => [],	3618	items => [],
3056	z => 100,	3619	z => 100,
3057	@_,	3620	@_,
3058	);	3621	);
3059		3622
3060	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3623	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061		3624
3062	for my $item (@{ $self->{items} }) {	3625	for my $item (@{ $self->{items} }) {
3063	my ($widget, $cb, $tooltip) = @$item;	3626	my ($widget, $cb, $tooltip) = @$item;
3064		3627
3065	# handle various types of items, only text for now	3628	# handle various types of items, only text for now
3066	if (!ref $widget) {	3629	if (!ref $widget) {
		3630	if ($widget =~ /\t/) {
		3631	my ($left, $right) = split /\t/, $widget, 2;
		3632
3067	$widget = new CFClient::UI::Label	3633	$widget = new CFPlus::UI::HBox
3068	can_hover => 1,	3634	can_hover => 1,
3069	can_events => 1,	3635	can_events => 1,
		3636	tooltip => $tooltip,
		3637	children => [
		3638	(new CFPlus::UI::Label markup => $left, expand => 1),
		3639	(new CFPlus::UI::Label markup => $right, align => +1),
		3640	],
		3641	;
		3642
		3643	} else {
		3644	$widget = new CFPlus::UI::Label
		3645	can_hover => 1,
		3646	can_events => 1,
3070	markup => $widget,	3647	markup => $widget,
3071	tooltip => $tooltip	3648	tooltip => $tooltip;
		3649	}
3072	}	3650	}
3073		3651
3074	$self->{item}{$widget} = $item;	3652	$self->{item}{$widget} = $item;
3075		3653
3076	$self->{vbox}->add ($widget);	3654	$self->{vbox}->add ($widget);
…		…
3119	1	3697	1
3120	}	3698	}
3121		3699
3122	#############################################################################	3700	#############################################################################
3123		3701
3124	package CFClient::UI::Multiplexer;	3702	package CFPlus::UI::Multiplexer;
3125		3703
3126	our @ISA = CFClient::UI::Container::;	3704	our @ISA = CFPlus::UI::Container::;
3127		3705
3128	sub new {	3706	sub new {
3129	my $class = shift;	3707	my $class = shift;
3130		3708
3131	my $self = $class->SUPER::new (	3709	my $self = $class->SUPER::new (
…		…
3145		3723
3146	$self->{current} = $self->{children}[0]	3724	$self->{current} = $self->{children}[0]
3147	if @{ $self->{children} };	3725	if @{ $self->{children} };
3148	}	3726	}
3149		3727
		3728	sub get_current_page {
		3729	my ($self) = @_;
		3730
		3731	$self->{current}
		3732	}
		3733
3150	sub set_current_page {	3734	sub set_current_page {
3151	my ($self, $page_or_widget) = @_;	3735	my ($self, $page_or_widget) = @_;
3152		3736
3153	my $widget = ref $page_or_widget	3737	my $widget = ref $page_or_widget
3154	? $page_or_widget	3738	? $page_or_widget
…		…
3186	$self->{current}->draw;	3770	$self->{current}->draw;
3187	}	3771	}
3188		3772
3189	#############################################################################	3773	#############################################################################
3190		3774
3191	package CFClient::UI::Notebook;	3775	package CFPlus::UI::Notebook;
3192		3776
3193	our @ISA = CFClient::UI::VBox::;	3777	our @ISA = CFPlus::UI::VBox::;
3194		3778
3195	sub new {	3779	sub new {
3196	my $class = shift;	3780	my $class = shift;
3197		3781
3198	my $self = $class->SUPER::new (	3782	my $self = $class->SUPER::new (
3199	buttonbar => (new CFClient::UI::Buttonbar),	3783	buttonbar => (new CFPlus::UI::Buttonbar),
3200	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3784	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3201	# filter => # will be put between multiplexer and $self	3785	# filter => # will be put between multiplexer and $self
3202	@_,	3786	@_,
3203	);	3787	);
3204		3788
3205	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3789	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3209	}	3793	}
3210		3794
3211	sub add {	3795	sub add {
3212	my ($self, $title, $widget, $tooltip) = @_;	3796	my ($self, $title, $widget, $tooltip) = @_;
3213		3797
3214	Scalar::Util::weaken $self;	3798	CFPlus::weaken $self;
3215		3799
3216	$self->{buttonbar}->add (new CFClient::UI::Button	3800	$self->{buttonbar}->add (new CFPlus::UI::Button
3217	markup => $title,	3801	markup => $title,
3218	tooltip => $tooltip,	3802	tooltip => $tooltip,
3219	on_activate => sub { $self->set_current_page ($widget) },	3803	on_activate => sub { $self->set_current_page ($widget) },
3220	);	3804	);
3221		3805
3222	$self->{multiplexer}->add ($widget);	3806	$self->{multiplexer}->add ($widget);
3223	}	3807	}
3224		3808
		3809	sub get_current_page {
		3810	my ($self) = @_;
		3811
		3812	$self->{multiplexer}->get_current_page
		3813	}
		3814
3225	sub set_current_page {	3815	sub set_current_page {
3226	my ($self, $page) = @_;	3816	my ($self, $page) = @_;
3227		3817
3228	$self->{multiplexer}->set_current_page ($page);	3818	$self->{multiplexer}->set_current_page ($page);
3229	$self->emit (page_changed => $self->{multiplexer}{current});	3819	$self->emit (page_changed => $self->{multiplexer}{current});
3230	}	3820	}
3231		3821
3232	#############################################################################	3822	#############################################################################
3233		3823
3234	package CFClient::UI::Combobox;	3824	package CFPlus::UI::Selector;
3235		3825
3236	use utf8;	3826	use utf8;
3237		3827
3238	our @ISA = CFClient::UI::Button::;	3828	our @ISA = CFPlus::UI::Button::;
3239		3829
3240	sub new {	3830	sub new {
3241	my $class = shift;	3831	my $class = shift;
3242		3832
3243	my $self = $class->SUPER::new (	3833	my $self = $class->SUPER::new (
…		…
3260	my ($value, $title, $tooltip) = @$_;	3850	my ($value, $title, $tooltip) = @$_;
3261		3851
3262	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3852	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263	}	3853	}
3264		3854
3265	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3855	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266	}	3856	}
3267		3857
3268	sub _set_value {	3858	sub _set_value {
3269	my ($self, $value) = @_;	3859	my ($self, $value) = @_;
3270		3860
…		…
3285	$self->emit (changed => $value);	3875	$self->emit (changed => $value);
3286	}	3876	}
3287		3877
3288	#############################################################################	3878	#############################################################################
3289		3879
3290	package CFClient::UI::Statusbox;	3880	package CFPlus::UI::Statusbox;
3291		3881
3292	our @ISA = CFClient::UI::VBox::;	3882	our @ISA = CFPlus::UI::VBox::;
3293		3883
3294	sub new {	3884	sub new {
3295	my $class = shift;	3885	my $class = shift;
3296		3886
3297	my $self = $class->SUPER::new (	3887	my $self = $class->SUPER::new (
3298	fontsize => 0.8,	3888	fontsize => 0.8,
3299	@_,	3889	@_,
3300	);	3890	);
3301		3891
3302	Scalar::Util::weaken (my $this = $self);	3892	CFPlus::weaken (my $this = $self);
3303		3893
3304	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3894	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305		3895
3306	$self	3896	$self
3307	}	3897	}
…		…
3309	sub reorder {	3899	sub reorder {
3310	my ($self) = @_;	3900	my ($self) = @_;
3311	my $NOW = Time::HiRes::time;	3901	my $NOW = Time::HiRes::time;
3312		3902
3313	# freeze display when hovering over any label	3903	# freeze display when hovering over any label
3314	return if $CFClient::UI::TOOLTIP->{owner}	3904	return if $CFPlus::UI::TOOLTIP->{owner}
3315	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3905	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3316	values %{ $self->{item} };	3906	values %{ $self->{item} };
3317		3907
3318	while (my ($k, $v) = each %{ $self->{item} }) {	3908	while (my ($k, $v) = each %{ $self->{item} }) {
3319	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3909	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3320	}	3910	}
…		…
3341	for ($short) {	3931	for ($short) {
3342	s/^\s+//;	3932	s/^\s+//;
3343	s/\s+/ /g;	3933	s/\s+/ /g;
3344	}	3934	}
3345		3935
3346	new CFClient::UI::Label	3936	new CFPlus::UI::Label
3347	markup => $short,	3937	markup => $short,
3348	tooltip => $item->{tooltip},	3938	tooltip => $item->{tooltip},
3349	tooltip_font => $::FONT_PROP,	3939	tooltip_font => $::FONT_PROP,
3350	tooltip_width => 0.67,	3940	tooltip_width => 0.67,
3351	fontsize => $item->{fontsize} || $self->{fontsize},	3941	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3405	count => 1,	3995	count => 1,
3406	%arg,	3996	%arg,
3407	};	3997	};
3408	}	3998	}
3409		3999
		4000	$ROOT->on_refresh (reorder => sub {
3410	$self->reorder;	4001	$self->reorder;
		4002	});
3411	}	4003	}
3412		4004
3413	sub reconfigure {	4005	sub reconfigure {
3414	my ($self) = @_;	4006	my ($self) = @_;
3415		4007
…		…
3428	$self->SUPER::destroy;	4020	$self->SUPER::destroy;
3429	}	4021	}
3430		4022
3431	#############################################################################	4023	#############################################################################
3432		4024
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;	4025	package CFPlus::UI::Root;
3806		4026
3807	our @ISA = CFClient::UI::Container::;	4027	our @ISA = CFPlus::UI::Container::;
3808		4028
3809	use List::Util qw(min max);	4029	use List::Util qw(min max);
3810		4030
3811	use CFClient::OpenGL;	4031	use CFPlus::OpenGL;
3812		4032
3813	sub new {	4033	sub new {
3814	my $class = shift;	4034	my $class = shift;
3815		4035
3816	my $self = $class->SUPER::new (	4036	my $self = $class->SUPER::new (
3817	visible => 1,	4037	visible => 1,
3818	@_,	4038	@_,
3819	);	4039	);
3820		4040
3821	Scalar::Util::weaken ($self->{root} = $self);	4041	CFPlus::weaken ($self->{root} = $self);
3822		4042
3823	$self	4043	$self
3824	}	4044	}
3825		4045
3826	sub size_request {	4046	sub size_request {
…		…
3992	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4212	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993		4213
3994	$w = 0 if $w < 0;	4214	$w = 0 if $w < 0;
3995	$h = 0 if $h < 0;	4215	$h = 0 if $h < 0;
3996		4216
		4217	$w = max $widget->{min_w}, $w;
		4218	$h = max $widget->{min_h}, $h;
		4219
		4220	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4221	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4222
		4223	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4224	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4225
3997	$w = int $w + 0.5;	4226	$w = int $w + 0.5;
3998	$h = int $h + 0.5;	4227	$h = int $h + 0.5;
3999		4228
4000	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4229	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001	$widget->{old_w} = $widget->{w};	4230	$widget->{old_w} = $widget->{w};
…		…
4011		4240
4012	while ($self->{post_alloc_hook}) {	4241	while ($self->{post_alloc_hook}) {
4013	$_->()	4242	$_->()
4014	for values %{delete $self->{post_alloc_hook}};	4243	for values %{delete $self->{post_alloc_hook}};
4015	}	4244	}
4016
4017		4245
4018	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4246	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4019	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4247	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4020	glClear GL_COLOR_BUFFER_BIT;	4248	glClear GL_COLOR_BUFFER_BIT;
4021		4249
…		…
4024	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4252	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4025	glMatrixMode GL_MODELVIEW;	4253	glMatrixMode GL_MODELVIEW;
4026	glLoadIdentity;	4254	glLoadIdentity;
4027		4255
4028	{	4256	{
4029	package CFClient::UI::Base;	4257	package CFPlus::UI::Base;
4030		4258
4031	($draw_x, $draw_y, $draw_w, $draw_h) =	4259	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4032	(0, 0, $self->{w}, $self->{h});	4260	(0, 0, $self->{w}, $self->{h});
4033	}
4034		4261
4035	$self->_draw;	4262	$self->_draw;
		4263	}
4036	}	4264	}
4037		4265
4038	#############################################################################	4266	#############################################################################
4039		4267
4040	package CFClient::UI;	4268	package CFPlus::UI;
4041		4269
4042	$ROOT = new CFClient::UI::Root;	4270	$ROOT = new CFPlus::UI::Root;
4043	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4271	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4044		4272
4045	1	4273	1
4046		4274

Diff Legend

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