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.313 by root, Sat Jun 24 00:24:09 2006 UTC vs.
Revision 1.390 by root, Sat Jul 21 13:29:46 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
…		…
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	$visible ? $self->SUPER::add ($self->{hslider})
		1126	: $self->SUPER::remove ($self->{hslider});
		1127	}
		1128
		1129	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1130	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1131
		1132	my $visible = $h1 > $h2;
		1133	if ($visible != $self->{vslider}{visible}) {
		1134	$visible ? $self->SUPER::add ($self->{vslider})
		1135	: $self->SUPER::remove ($self->{vslider});
		1136	}
		1137	}
		1138
997	sub update {	1139	sub update {
998	my ($self) = @_;	1140	my ($self) = @_;
999		1141
		1142	$self->update_slider;
1000	$self->SUPER::update;	1143	$self->SUPER::update;
		1144	}
1001		1145
1002	# todo: overwrite size_allocate of child	1146	sub invoke_mouse_wheel {
1003	my $child = $self->{vp}->child;	1147	my ($self, $ev) = @_;
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1148
		1149	$self->{vslider}->emit (mouse_wheel => $ev)
		1150	if $ev->{dy};
		1151
		1152	$self->{hslider}->emit (mouse_wheel => $ev)
		1153	if $ev->{dx};
		1154
		1155	1
		1156	}
		1157
		1158	sub invoke_button_down {
		1159	my ($self, $ev, $x, $y) = @_;
		1160
		1161	if ($ev->{button} == 2) {
		1162	$self->grab_focus;
		1163
		1164	my $ox = $self->{vp}{view_x} + $ev->{x};
		1165	my $oy = $self->{vp}{view_y} + $ev->{y};
		1166
		1167	$self->{motion} = sub {
		1168	my ($ev, $x, $y) = @_;
		1169
		1170	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1171	$self->update;
		1172	};
		1173
		1174	return 1;
		1175	}
		1176
		1177	0
		1178	}
		1179
		1180	sub invoke_button_up {
		1181	my ($self, $ev, $x, $y) = @_;
		1182
		1183	if (delete $self->{motion}) {
		1184	return 1;
		1185	}
		1186
		1187	0
		1188	}
		1189
		1190	sub invoke_mouse_motion {
		1191	my ($self, $ev, $x, $y) = @_;
		1192
		1193	if ($self->{motion}) {
		1194	$self->{motion}->($ev, $x, $y);
		1195	return 1;
		1196	}
		1197
		1198	0
1005	}	1199	}
1006		1200
1007	sub invoke_size_allocate {	1201	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1202	my ($self, $w, $h) = @_;
1009		1203
1010	my $child = $self->{vp}->child;	1204	$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)	1205	$self->SUPER::invoke_size_allocate ($w, $h)
1014	}	1206	}
1015		1207
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018
1019	#############################################################################	1208	#############################################################################
1020		1209
1021	package CFClient::UI::Frame;	1210	package CFPlus::UI::Frame;
1022		1211
1023	our @ISA = CFClient::UI::Bin::;	1212	our @ISA = CFPlus::UI::Bin::;
1024		1213
1025	use CFClient::OpenGL;	1214	use CFPlus::OpenGL;
1026		1215
1027	sub new {	1216	sub new {
1028	my $class = shift;	1217	my $class = shift;
1029		1218
1030	$class->SUPER::new (	1219	$class->SUPER::new (
…		…
1056	$self->SUPER::_draw;	1245	$self->SUPER::_draw;
1057	}	1246	}
1058		1247
1059	#############################################################################	1248	#############################################################################
1060		1249
1061	package CFClient::UI::FancyFrame;	1250	package CFPlus::UI::FancyFrame;
1062		1251
1063	our @ISA = CFClient::UI::Bin::;	1252	our @ISA = CFPlus::UI::Bin::;
1064		1253
1065	use CFClient::OpenGL;	1254	use CFPlus::OpenGL;
		1255
		1256	sub new {
		1257	my ($class, %arg) = @_;
		1258
		1259	if ((exists $arg{label}) && !ref $arg{label}) {
		1260	$arg{label} = new CFPlus::UI::Label
		1261	align => 1,
		1262	valign => 0,
		1263	text => $arg{label},
		1264	fontsize => ($arg{border} || 0.8) * 0.75;
		1265	}
		1266
		1267	my $self = $class->SUPER::new (
		1268	# label => "",
		1269	fg => [0.6, 0.3, 0.1],
		1270	border => 0.8,
		1271	style => 'single',
		1272	%arg,
		1273	);
		1274
		1275	$self
		1276	}
		1277
		1278	sub add {
		1279	my ($self, @widgets) = @_;
		1280
		1281	$self->SUPER::add (@widgets);
		1282	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1283	}
		1284
		1285	sub border {
		1286	int $_[0]{border} * $::FONTSIZE
		1287	}
		1288
		1289	sub size_request {
		1290	my ($self) = @_;
		1291
		1292	($self->{label_w}, undef) = $self->{label}->size_request
		1293	if $self->{label};
		1294
		1295	my ($w, $h) = $self->SUPER::size_request;
		1296
		1297	(
		1298	$w + $self->border * 2,
		1299	$h + $self->border * 2,
		1300	)
		1301	}
		1302
		1303	sub invoke_size_allocate {
		1304	my ($self, $w, $h) = @_;
		1305
		1306	my $border = $self->border;
		1307
		1308	$w -= List::Util::max 0, $border * 2;
		1309	$h -= List::Util::max 0, $border * 2;
		1310
		1311	if (my $label = $self->{label}) {
		1312	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1313	$label->{h} = List::Util::min $h, $border;
		1314	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1315	}
		1316
		1317	$self->child->configure ($border, $border, $w, $h);
		1318
		1319	1
		1320	}
		1321
		1322	sub _draw {
		1323	my ($self) = @_;
		1324
		1325	my $child = $self->{children}[0];
		1326
		1327	my $border = $self->border;
		1328	my ($w, $h) = ($self->{w}, $self->{h});
		1329
		1330	$child->draw;
		1331
		1332	glColor @{$self->{fg}};
		1333	glBegin GL_LINE_STRIP;
		1334	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1335	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1336	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1337	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1338	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1339	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1340	glEnd;
		1341
		1342	if ($self->{label}) {
		1343	glTranslate $border * 2, 0;
		1344	$self->{label}->_draw;
		1345	}
		1346	}
		1347
		1348	#############################################################################
		1349
		1350	package CFPlus::UI::Toplevel;
		1351
		1352	our @ISA = CFPlus::UI::Bin::;
		1353
		1354	use CFPlus::OpenGL;
1066		1355
1067	my $bg =	1356	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1357	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1358	mipmap => 1, wrap => 1;
1070		1359
1071	my @border =	1360	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1361	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);	1362	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1363
		1364	my @icon =
		1365	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1366	qw(x1_move.png x1_resize.png);
1074		1367
1075	sub new {	1368	sub new {
1076	my ($class, %arg) = @_;	1369	my ($class, %arg) = @_;
1077		1370
1078	my $self = $class->SUPER::new (	1371	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1372	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1373	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1374	border => 0.6,
1082	can_events => 1,	1375	can_events => 1,
1083	min_w => 16,	1376	min_w => 64,
1084	min_h => 16,	1377	min_h => 32,
1085	%arg,	1378	%arg,
1086	);	1379	);
1087		1380
1088	$self->{title_widget} = new CFClient::UI::Label	1381	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1382	align => 0,
1090	valign => 1,	1383	valign => 1,
1091	text => $self->{title},	1384	text => $self->{title},
1092	fontsize => $self->{border},	1385	fontsize => $self->{border},
1093	if exists $self->{title};	1386	if exists $self->{title};
1094		1387
1095	if ($self->{has_close_button}) {	1388	if ($self->{has_close_button}) {
1096	$self->{close_button} =	1389	$self->{close_button} =
1097	new CFClient::UI::ImageButton	1390	new CFPlus::UI::ImageButton
1098	path => 'x1_close.png',	1391	path => 'x1_close.png',
1099	on_activate => sub { $self->hide };	1392	on_activate => sub { $self->emit ("delete") };
1100		1393
1101	$self->CFClient::UI::Container::add ($self->{close_button});	1394	$self->CFPlus::UI::Container::add ($self->{close_button});
1102	}	1395	}
1103		1396
1104	$self	1397	$self
1105	}	1398	}
1106		1399
1107	sub add {	1400	sub add {
1108	my ($self, @widgets) = @_;	1401	my ($self, @widgets) = @_;
1109		1402
1110	$self->SUPER::add (@widgets);	1403	$self->SUPER::add (@widgets);
1111	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1404	$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};	1405	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113	}	1406	}
1114		1407
1115	sub border {	1408	sub border {
1116	int $_[0]{border} * $::FONTSIZE	1409	int $_[0]{border} * $::FONTSIZE
1117	}	1410	}
…		…
1150	$self->child->configure ($border, $border, $w, $h);	1443	$self->child->configure ($border, $border, $w, $h);
1151		1444
1152	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1445	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153	if $self->{close_button};	1446	if $self->{close_button};
1154		1447
		1448	1
		1449	}
		1450
		1451	sub invoke_delete {
		1452	my ($self) = @_;
		1453
		1454	$self->hide;
		1455
1155	1	1456	1
1156	}	1457	}
1157		1458
1158	sub invoke_button_down {	1459	sub invoke_button_down {
1159	my ($self, $ev, $x, $y) = @_;	1460	my ($self, $ev, $x, $y) = @_;
…		…
1217	$self->{motion}->($ev, $x, $y) if $self->{motion};	1518	$self->{motion}->($ev, $x, $y) if $self->{motion};
1218		1519
1219	! ! $self->{motion}	1520	! ! $self->{motion}
1220	}	1521	}
1221		1522
		1523	sub invoke_visibility_change {
		1524	my ($self, $visible) = @_;
		1525
		1526	delete $self->{motion} unless $visible;
		1527
		1528	0
		1529	}
		1530
1222	sub _draw {	1531	sub _draw {
1223	my ($self) = @_;	1532	my ($self) = @_;
1224		1533
1225	my $child = $self->{children}[0];	1534	my $child = $self->{children}[0];
1226		1535
…		…
1231	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1540	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1232		1541
1233	my $border = $self->border;	1542	my $border = $self->border;
1234		1543
1235	glColor @{ $self->{border_bg} };	1544	glColor @{ $self->{border_bg} };
1236	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1545	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1237	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1546	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1238	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1547	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1239	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1548	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1549
		1550	# move
		1551	my $w2 = ($w - $border) * .5;
		1552	my $h2 = ($h - $border) * .5;
		1553	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1554	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1555	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1556
		1557	# resize
		1558	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1559	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1560	unless $self->{has_close_button};
		1561	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1562	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1240		1563
1241	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1564	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1242	glColor @{ $self->{bg} };	1565	glColor @{ $self->{bg} };
1243		1566
1244	# TODO: repeat texture not scale	1567	# TODO: repeat texture not scale
…		…
1263	if $self->{close_button};	1586	if $self->{close_button};
1264	}	1587	}
1265		1588
1266	#############################################################################	1589	#############################################################################
1267		1590
1268	package CFClient::UI::Table;	1591	package CFPlus::UI::Table;
1269		1592
1270	our @ISA = CFClient::UI::Base::;	1593	our @ISA = CFPlus::UI::Container::;
1271		1594
1272	use List::Util qw(max sum);	1595	use List::Util qw(max sum);
1273		1596
1274	use CFClient::OpenGL;	1597	use CFPlus::OpenGL;
1275		1598
1276	sub new {	1599	sub new {
1277	my $class = shift;	1600	my $class = shift;
1278		1601
1279	$class->SUPER::new (	1602	$class->SUPER::new (
1280	col_expand => [],	1603	col_expand => [],
		1604	row_expand => [],
1281	@_,	1605	@_,
1282	)	1606	)
1283	}	1607	}
1284		1608
1285	sub children {
1286	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287	}
1288
1289	sub add {	1609	sub add {
1290	my ($self, $x, $y, $child) = @_;	1610	my ($self, @widgets) = @_;
1291		1611
1292	$child->set_parent ($self);	1612	for my $child (@widgets) {
1293	$self->{children}[$y][$x] = $child;	1613	$child->{rowspan} ||= 1;
		1614	$child->{colspan} ||= 1;
		1615	}
1294		1616
1295	$self->realloc;	1617	$self->SUPER::add (@widgets);
1296	}	1618	}
1297		1619
1298	sub remove {	1620	sub add_at {
		1621	my $self = shift;
		1622
		1623	my @widgets;
		1624
		1625	while (@_) {
		1626	my ($col, $row, $child) = splice @_, 0, 3, ();
		1627
		1628	$child->{row} = $row;
		1629	$child->{col} = $col;
		1630
		1631	push @widgets, $child;
		1632	}
		1633
		1634	$self->add (@widgets);
		1635	}
		1636
		1637	sub get_wh {
1299	my ($self, $child) = @_;	1638	my ($self) = @_;
1300		1639
1301	# TODO: not yet implemented	1640	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		1641
1308	my @children = $self->children;	1642	my @children = $self->children;
1309	delete $self->{children};
1310
1311	for (@children) {
1312	delete $_->{parent};
1313	$_->hide;
1314	}
1315		1643
1316	$self->realloc;	1644	for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {
1317	}	1645	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1318		1646
1319	sub get_wh {	1647	my $sw = sum @w[$c .. $c + $cs - 1];
1320	my ($self) = @_;	1648	my $sh = sum @h[$r .. $r + $rs - 1];
1321		1649
1322	my (@w, @h);	1650	if ($w > $sw) {
		1651	$_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
		1652	}
1323		1653
1324	for my $y (0 .. $#{$self->{children}}) {	1654	if ($h > $sh) {
1325	my $row = $self->{children}[$y]	1655	$_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
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)};
1332
1333	$w[$x] = max $w[$x], $w;
1334	$h[$y] = max $h[$y], $h;
1335	}	1656	}
1336	}	1657	}
1337		1658
1338	(\@w, \@h)	1659	(\@w, \@h)
1339	}	1660	}
…		…
1355	my ($ws, $hs) = $self->get_wh;	1676	my ($ws, $hs) = $self->get_wh;
1356		1677
1357	my $req_w = (sum @$ws) || 1;	1678	my $req_w = (sum @$ws) || 1;
1358	my $req_h = (sum @$hs) || 1;	1679	my $req_h = (sum @$hs) || 1;
1359		1680
1360	# TODO: nicer code && do row_expand	1681	# now linearly scale the rows/columns to the allocated size
1361	my @col_expand = @{$self->{col_expand}};	1682	my @col_expand = @{$self->{col_expand}};
1362	@col_expand = (1) x @$ws unless @col_expand;	1683	@col_expand = (1) x @$ws unless @col_expand;
1363	my $col_expand = (sum @col_expand) || 1;	1684	my $col_expand = (sum @col_expand) || 1;
1364		1685
1365	# linearly scale sizes
1366	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1686	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368		1687
1369	CFClient::UI::harmonize $ws;	1688	CFPlus::UI::harmonize $ws;
		1689
		1690	my @row_expand = @{$self->{row_expand}};
		1691	@row_expand = (1) x @$ws unless @row_expand;
		1692	my $row_expand = (sum @row_expand) || 1;
		1693
		1694	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1695
1370	CFClient::UI::harmonize $hs;	1696	CFPlus::UI::harmonize $hs;
1371		1697
1372	my $y;	1698	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1699	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1373		1700
1374	for my $r (0 .. $#{$self->{children}}) {	1701	for my $widget ($self->children) {
1375	my $row = $self->{children}[$r]	1702	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1376	or next;
1377		1703
1378	my $x = 0;	1704	$widget->configure (
1379	my $row_h = $hs->[$r];	1705	$x[$c], $y[$r],
		1706	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1380		1707	);
1381	for my $c (0 .. $#$row) {	1708	}
1382	my $col_w = $ws->[$c];
1383		1709
1384	if (my $widget = $row->[$c]) {	1710	1
1385	$widget->configure ($x, $y, $col_w, $row_h);	1711	}
1386	}
1387		1712
1388	$x += $col_w;	1713	#############################################################################
		1714
		1715	package CFPlus::UI::Fixed;
		1716
		1717	use List::Util qw(min max);
		1718
		1719	our @ISA = CFPlus::UI::Container::;
		1720
		1721	sub add {
		1722	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1723
		1724	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1725	$self->SUPER::add ($child);
		1726	}
		1727
		1728	sub _scale($$$) {
		1729	my ($mode, $val, $max) = @_;
		1730
		1731	$mode eq "abs" ? $val
		1732	: $mode eq "rel" ? $val * $max
		1733	: 0
		1734	}
		1735
		1736	sub size_request {
		1737	my ($self) = @_;
		1738
		1739	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1740
		1741	# determine overall size by querying abs widgets
		1742	for my $child ($self->visible_children) {
		1743	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1744
		1745	if ($pos eq "abs") {
		1746	$w = _scale $size, $w, $child->{req_w};
		1747	$h = _scale $size, $h, $child->{req_h};
		1748
		1749	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1750	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1389	}	1751	}
		1752	}
1390		1753
1391	$y += $row_h;	1754	my $W = $x2 - $x1;
		1755	my $H = $y2 - $y1;
		1756
		1757	# now layout remaining widgets
		1758	for my $child ($self->visible_children) {
		1759	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1760
		1761	if ($pos ne "abs") {
		1762	$x = _scale $pos, $x, $W;
		1763	$y = _scale $pos, $x, $H;
		1764	$w = _scale $size, $w, $child->{req_w};
		1765	$h = _scale $size, $h, $child->{req_h};
		1766
		1767	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1768	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1769	}
		1770	}
		1771
		1772	my $W = $x2 - $x1;
		1773	my $H = $y2 - $y1;
		1774
		1775	($W, $H)
		1776	}
		1777
		1778	sub invoke_size_allocate {
		1779	my ($self, $W, $H) = @_;
		1780
		1781	for my $child ($self->visible_children) {
		1782	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1783
		1784	$x = _scale $pos, $x, $W;
		1785	$y = _scale $pos, $x, $H;
		1786	$w = _scale $size, $w, $child->{req_w};
		1787	$h = _scale $size, $h, $child->{req_h};
		1788
		1789	$child->configure ($x, $y, $w, $h);
1392	}	1790	}
1393		1791
1394	1	1792	1
1395	}	1793	}
1396		1794
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	#############################################################################	1795	#############################################################################
1422		1796
1423	package CFClient::UI::Box;	1797	package CFPlus::UI::Box;
1424		1798
1425	our @ISA = CFClient::UI::Container::;	1799	our @ISA = CFPlus::UI::Container::;
1426		1800
1427	sub size_request {	1801	sub size_request {
1428	my ($self) = @_;	1802	my ($self) = @_;
1429		1803
1430	$self->{vertical}	1804	$self->{vertical}
…		…
1463	$req[$_] += $space * $children[$_]{expand}	1837	$req[$_] += $space * $children[$_]{expand}
1464	for 0 .. $#children;	1838	for 0 .. $#children;
1465	}	1839	}
1466	}	1840	}
1467		1841
1468	CFClient::UI::harmonize \@req;	1842	CFPlus::UI::harmonize \@req;
1469		1843
1470	my $pos = 0;	1844	my $pos = 0;
1471	for (0 .. $#children) {	1845	for (0 .. $#children) {
1472	my $alloc = $req[$_];	1846	my $alloc = $req[$_];
1473	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1847	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1478	1	1852	1
1479	}	1853	}
1480		1854
1481	#############################################################################	1855	#############################################################################
1482		1856
1483	package CFClient::UI::HBox;	1857	package CFPlus::UI::HBox;
1484		1858
1485	our @ISA = CFClient::UI::Box::;	1859	our @ISA = CFPlus::UI::Box::;
1486		1860
1487	sub new {	1861	sub new {
1488	my $class = shift;	1862	my $class = shift;
1489		1863
1490	$class->SUPER::new (	1864	$class->SUPER::new (
…		…
1493	)	1867	)
1494	}	1868	}
1495		1869
1496	#############################################################################	1870	#############################################################################
1497		1871
1498	package CFClient::UI::VBox;	1872	package CFPlus::UI::VBox;
1499		1873
1500	our @ISA = CFClient::UI::Box::;	1874	our @ISA = CFPlus::UI::Box::;
1501		1875
1502	sub new {	1876	sub new {
1503	my $class = shift;	1877	my $class = shift;
1504		1878
1505	$class->SUPER::new (	1879	$class->SUPER::new (
…		…
1508	)	1882	)
1509	}	1883	}
1510		1884
1511	#############################################################################	1885	#############################################################################
1512		1886
1513	package CFClient::UI::Label;	1887	package CFPlus::UI::Label;
1514		1888
1515	our @ISA = CFClient::UI::DrawBG::;	1889	our @ISA = CFPlus::UI::DrawBG::;
1516		1890
1517	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1518		1892
1519	sub new {	1893	sub new {
1520	my ($class, %arg) = @_;	1894	my ($class, %arg) = @_;
1521		1895
1522	my $self = $class->SUPER::new (	1896	my $self = $class->SUPER::new (
…		…
1525	#active_bg => none	1899	#active_bg => none
1526	#font => default_font	1900	#font => default_font
1527	#text => initial text	1901	#text => initial text
1528	#markup => initial narkup	1902	#markup => initial narkup
1529	#max_w => maximum pixel width	1903	#max_w => maximum pixel width
		1904	#style => 0, # render flags
1530	ellipsise => 3, # end	1905	ellipsise => 3, # end
1531	layout => (new CFClient::Layout),	1906	layout => (new CFPlus::Layout),
1532	fontsize => 1,	1907	fontsize => 1,
1533	align => -1,	1908	align => -1,
1534	valign => -1,	1909	valign => -1,
1535	padding_x => 2,	1910	padding_x => 2,
1536	padding_y => 2,	1911	padding_y => 2,
1537	can_events => 0,	1912	can_events => 0,
1538	%arg	1913	%arg
1539	);	1914	);
1540		1915
1541	if (exists $self->{template}) {	1916	if (exists $self->{template}) {
1542	my $layout = new CFClient::Layout;	1917	my $layout = new CFPlus::Layout;
1543	$layout->set_text (delete $self->{template});	1918	$layout->set_text (delete $self->{template});
1544	$self->{template} = $layout;	1919	$self->{template} = $layout;
1545	}	1920	}
1546		1921
1547	if (exists $self->{markup}) {	1922	if (exists $self->{markup}) {
…		…
1551	}	1926	}
1552		1927
1553	$self	1928	$self
1554	}	1929	}
1555		1930
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 {	1931	sub update {
1567	my ($self) = @_;	1932	my ($self) = @_;
1568		1933
1569	delete $self->{texture};	1934	delete $self->{texture};
1570	$self->SUPER::update;	1935	$self->SUPER::update;
…		…
1581	my ($self, $text) = @_;	1946	my ($self, $text) = @_;
1582		1947
1583	return if $self->{text} eq "T$text";	1948	return if $self->{text} eq "T$text";
1584	$self->{text} = "T$text";	1949	$self->{text} = "T$text";
1585		1950
1586	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587	$self->{layout}->set_text ($text);	1951	$self->{layout}->set_text ($text);
1588		1952
1589	delete $self->{size_req};	1953	delete $self->{size_req};
1590	$self->realloc;	1954	$self->realloc;
1591	$self->update;	1955	$self->update;
…		…
1597	return if $self->{text} eq "M$markup";	1961	return if $self->{text} eq "M$markup";
1598	$self->{text} = "M$markup";	1962	$self->{text} = "M$markup";
1599		1963
1600	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1964	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601		1965
1602	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603	$self->{layout}->set_markup ($markup);	1966	$self->{layout}->set_markup ($markup);
1604		1967
1605	delete $self->{size_req};	1968	delete $self->{size_req};
1606	$self->realloc;	1969	$self->realloc;
1607	$self->update;	1970	$self->update;
…		…
1619		1982
1620	my ($w, $h) = $self->{layout}->size;	1983	my ($w, $h) = $self->{layout}->size;
1621		1984
1622	if (exists $self->{template}) {	1985	if (exists $self->{template}) {
1623	$self->{template}->set_font ($self->{font}) if $self->{font};	1986	$self->{template}->set_font ($self->{font}) if $self->{font};
		1987	$self->{template}->set_width ($self->{max_w} || -1);
1624	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1988	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625		1989
1626	my ($w2, $h2) = $self->{template}->size;	1990	my ($w2, $h2) = $self->{template}->size;
1627		1991
1628	$w = List::Util::max $w, $w2;	1992	$w = List::Util::max $w, $w2;
…		…
1652		2016
1653	sub set_fontsize {	2017	sub set_fontsize {
1654	my ($self, $fontsize) = @_;	2018	my ($self, $fontsize) = @_;
1655		2019
1656	$self->{fontsize} = $fontsize;	2020	$self->{fontsize} = $fontsize;
		2021	delete $self->{size_req};
1657	delete $self->{texture};	2022	delete $self->{texture};
1658		2023
1659	$self->realloc;	2024	$self->realloc;
1660	}	2025	}
1661		2026
1662	sub reconfigure {	2027	sub reconfigure {
1663	my ($self) = @_;	2028	my ($self) = @_;
1664		2029
1665	delete $self->{size_req};	2030	delete $self->{size_req};
		2031	delete $self->{texture};
1666		2032
1667	$self->SUPER::reconfigure;	2033	$self->SUPER::reconfigure;
1668	}	2034	}
1669		2035
1670	sub _draw {	2036	sub _draw {
1671	my ($self) = @_;	2037	my ($self) = @_;
1672		2038
1673	$self->SUPER::_draw; # draw background, if applicable	2039	$self->SUPER::_draw; # draw background, if applicable
1674		2040
1675	my $tex = $self->{texture} ||= do {	2041	my $size = $self->{texture} ||= do {
1676	$self->{layout}->set_foreground (@{$self->{fg}});	2042	$self->{layout}->set_foreground (@{$self->{fg}});
1677	$self->{layout}->set_font ($self->{font}) if $self->{font};	2043	$self->{layout}->set_font ($self->{font}) if $self->{font};
1678	$self->{layout}->set_width ($self->{w});	2044	$self->{layout}->set_width ($self->{w});
1679	$self->{layout}->set_ellipsise ($self->{ellipsise});	2045	$self->{layout}->set_ellipsise ($self->{ellipsise});
1680	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2046	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2047	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682		2048
1683	new_from_layout CFClient::Texture $self->{layout}	2049	[$self->{layout}->size]
1684	};	2050	};
1685		2051
1686	unless (exists $self->{ox}) {	2052	unless (exists $self->{ox}) {
1687	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2053	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2054	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689	: ($self->{w} - $tex->{w}) * 0.5);	2055	: ($self->{w} - $size->[0]) * 0.5);
1690		2056
1691	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2057	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2058	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693	: ($self->{h} - $tex->{h}) * 0.5);	2059	: ($self->{h} - $size->[1]) * 0.5);
1694	};	2060	};
1695		2061
1696	glEnable GL_TEXTURE_2D;
1697
1698	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2062	my $w = List::Util::min $self->{w} + 4, $size->[0];
1699	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2063	my $h = List::Util::min $self->{h} + 2, $size->[1];
1700		2064
1701	if ($tex->{format} == GL_ALPHA) {	2065	$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	}	2066	}
1712		2067
1713	#############################################################################	2068	#############################################################################
1714		2069
1715	package CFClient::UI::EntryBase;	2070	package CFPlus::UI::EntryBase;
1716		2071
1717	our @ISA = CFClient::UI::Label::;	2072	our @ISA = CFPlus::UI::Label::;
1718		2073
1719	use CFClient::OpenGL;	2074	use CFPlus::OpenGL;
1720		2075
1721	sub new {	2076	sub new {
1722	my $class = shift;	2077	my $class = shift;
1723		2078
1724	$class->SUPER::new (	2079	$class->SUPER::new (
…		…
1728	active_fg => [0, 0, 0],	2083	active_fg => [0, 0, 0],
1729	can_hover => 1,	2084	can_hover => 1,
1730	can_focus => 1,	2085	can_focus => 1,
1731	valign => 0,	2086	valign => 0,
1732	can_events => 1,	2087	can_events => 1,
		2088	ellipsise => 0,
1733	#text => ...	2089	#text => ...
1734	#hidden => "*",	2090	#hidden => "*",
1735	@_	2091	@_
1736	)	2092	)
1737	}	2093	}
…		…
1782	my $sym = $ev->{sym};	2138	my $sym = $ev->{sym};
1783	my $uni = $ev->{unicode};	2139	my $uni = $ev->{unicode};
1784		2140
1785	my $text = $self->get_text;	2141	my $text = $self->get_text;
1786		2142
		2143	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2144
1787	if ($uni == 8) {	2145	if ($uni == 8) {
1788	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2146	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789	} elsif ($uni == 127) {	2147	} elsif ($uni == 127) {
1790	substr $text, $self->{cursor}, 1, "";	2148	substr $text, $self->{cursor}, 1, "";
1791	} elsif ($sym == CFClient::SDLK_LEFT) {	2149	} elsif ($sym == CFPlus::SDLK_LEFT) {
1792	--$self->{cursor} if $self->{cursor};	2150	--$self->{cursor} if $self->{cursor};
1793	} elsif ($sym == CFClient::SDLK_RIGHT) {	2151	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1794	++$self->{cursor} if $self->{cursor} < length $self->{text};	2152	++$self->{cursor} if $self->{cursor} < length $self->{text};
1795	} elsif ($sym == CFClient::SDLK_HOME) {	2153	} elsif ($sym == CFPlus::SDLK_HOME) {
		2154	# what a hack
		2155	$self->{cursor} =
		2156	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2157	? length $1
		2158	: 0;
		2159	} elsif ($sym == CFPlus::SDLK_END) {
		2160	# uh, again
		2161	$self->{cursor} =
		2162	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2163	? $self->{cursor} + length $1
		2164	: length $self->{text};
		2165	} elsif ($uni == 21) { # ctrl-u
		2166	$text = "";
1796	$self->{cursor} = 0;	2167	$self->{cursor} = 0;
1797	} elsif ($sym == CFClient::SDLK_END) {
1798	$self->{cursor} = length $text;
1799	} elsif ($uni == 27) {	2168	} elsif ($uni == 27) {
1800	$self->emit ('escape');	2169	$self->emit ('escape');
1801	} elsif ($uni) {	2170	} elsif ($uni == 0x0d) {
		2171	substr $text, $self->{cursor}++, 0, "\012";
		2172	} elsif ($uni >= 0x20) {
1802	substr $text, $self->{cursor}++, 0, chr $uni;	2173	substr $text, $self->{cursor}++, 0, chr $uni;
1803	} else {	2174	} else {
1804	return 0;	2175	return 0;
1805	}	2176	}
1806		2177
1807	$self->_set_text ($text);	2178	$self->_set_text ($text);
1808		2179
1809	$self->realloc;	2180	$self->realloc;
		2181	$self->update;
1810		2182
1811	1	2183	1
1812	}	2184	}
1813		2185
1814	sub invoke_focus_in {	2186	sub invoke_focus_in {
…		…
1826		2198
1827	my $idx = $self->{layout}->xy_to_index ($x, $y);	2199	my $idx = $self->{layout}->xy_to_index ($x, $y);
1828		2200
1829	# byte-index to char-index	2201	# byte-index to char-index
1830	my $text = $self->{text};	2202	my $text = $self->{text};
1831	utf8::encode $text;	2203	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832	$self->{cursor} = length substr $text, 0, $idx;	2204	$self->{cursor} = length $text;
1833		2205
1834	$self->_set_text ($self->{text});	2206	$self->_set_text ($self->{text});
1835	$self->update;	2207	$self->update;
1836		2208
1837	1	2209	1
…		…
1876	utf8::encode $text;	2248	utf8::encode $text;
1877		2249
1878	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2250	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879	}	2251	}
1880		2252
1881	glColor @{$self->{fg}};
1882	glBegin GL_LINES;	2253	glBegin GL_LINES;
1883	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2254	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};	2255	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885	glEnd;	2256	glEnd;
1886	}	2257	}
1887	}	2258	}
1888		2259
		2260	#############################################################################
		2261
1889	package CFClient::UI::Entry;	2262	package CFPlus::UI::Entry;
1890		2263
1891	our @ISA = CFClient::UI::EntryBase::;	2264	our @ISA = CFPlus::UI::EntryBase::;
1892		2265
1893	use CFClient::OpenGL;	2266	use CFPlus::OpenGL;
1894		2267
1895	sub invoke_key_down {	2268	sub invoke_key_down {
1896	my ($self, $ev) = @_;	2269	my ($self, $ev) = @_;
1897		2270
1898	my $sym = $ev->{sym};	2271	my $sym = $ev->{sym};
1899		2272
1900	if ($sym == 13) {	2273	if ($ev->{uni} == 0x0d || $sym == 13) {
1901	unshift @{$self->{history}},	2274	unshift @{$self->{history}},
1902	my $txt = $self->get_text;	2275	my $txt = $self->get_text;
1903		2276
1904	$self->{history_pointer} = -1;	2277	$self->{history_pointer} = -1;
1905	$self->{history_saveback} = '';	2278	$self->{history_saveback} = '';
1906	$self->emit (activate => $txt);	2279	$self->emit (activate => $txt);
1907	$self->update;	2280	$self->update;
1908		2281
1909	} elsif ($sym == CFClient::SDLK_UP) {	2282	} elsif ($sym == CFPlus::SDLK_UP) {
1910	if ($self->{history_pointer} < 0) {	2283	if ($self->{history_pointer} < 0) {
1911	$self->{history_saveback} = $self->get_text;	2284	$self->{history_saveback} = $self->get_text;
1912	}	2285	}
1913	if (@{$self->{history} || []} > 0) {	2286	if (@{$self->{history} || []} > 0) {
1914	$self->{history_pointer}++;	2287	$self->{history_pointer}++;
…		…
1916	$self->{history_pointer} = @{$self->{history} || []} - 1;	2289	$self->{history_pointer} = @{$self->{history} || []} - 1;
1917	}	2290	}
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2291	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1919	}	2292	}
1920		2293
1921	} elsif ($sym == CFClient::SDLK_DOWN) {	2294	} elsif ($sym == CFPlus::SDLK_DOWN) {
1922	$self->{history_pointer}--;	2295	$self->{history_pointer}--;
1923	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2296	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924		2297
1925	if ($self->{history_pointer} >= 0) {	2298	if ($self->{history_pointer} >= 0) {
1926	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2299	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1935	1	2308	1
1936	}	2309	}
1937		2310
1938	#############################################################################	2311	#############################################################################
1939		2312
		2313	package CFPlus::UI::TextEdit;
		2314
		2315	our @ISA = CFPlus::UI::EntryBase::;
		2316
		2317	use CFPlus::OpenGL;
		2318
		2319	sub move_cursor_ver {
		2320	my ($self, $dy) = @_;
		2321
		2322	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2323
		2324	$y += $dy;
		2325
		2326	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2327	$self->{cursor} = $index;
		2328	delete $self->{cur_h};
		2329	$self->update;
		2330	return;
		2331	}
		2332	}
		2333
		2334	sub invoke_key_down {
		2335	my ($self, $ev) = @_;
		2336
		2337	my $sym = $ev->{sym};
		2338
		2339	if ($sym == CFPlus::SDLK_UP) {
		2340	$self->move_cursor_ver (-1);
		2341	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2342	$self->move_cursor_ver (+1);
		2343	} else {
		2344	return $self->SUPER::invoke_key_down ($ev)
		2345	}
		2346
		2347	1
		2348	}
		2349
		2350	#############################################################################
		2351
1940	package CFClient::UI::Button;	2352	package CFPlus::UI::Button;
1941		2353
1942	our @ISA = CFClient::UI::Label::;	2354	our @ISA = CFPlus::UI::Label::;
1943		2355
1944	use CFClient::OpenGL;	2356	use CFPlus::OpenGL;
1945		2357
1946	my @tex =	2358	my @tex =
1947	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2359	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948	qw(b1_button_active.png);	2360	qw(b1_button_inactive.png b1_button_active.png);
1949		2361
1950	sub new {	2362	sub new {
1951	my $class = shift;	2363	my $class = shift;
1952		2364
1953	$class->SUPER::new (	2365	$class->SUPER::new (
1954	padding_x => 4,	2366	padding_x => 4,
1955	padding_y => 4,	2367	padding_y => 4,
1956	fg => [1, 1, 1],	2368	fg => [1.0, 1.0, 1.0],
1957	active_fg => [0, 0, 1],	2369	active_fg => [0.8, 0.8, 0.8],
1958	can_hover => 1,	2370	can_hover => 1,
1959	align => 0,	2371	align => 0,
1960	valign => 0,	2372	valign => 0,
1961	can_events => 1,	2373	can_events => 1,
1962	@_	2374	@_
…		…
1980		2392
1981	glEnable GL_TEXTURE_2D;	2393	glEnable GL_TEXTURE_2D;
1982	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2394	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983	glColor 0, 0, 0, 1;	2395	glColor 0, 0, 0, 1;
1984		2396
		2397	my $tex = $tex[$GRAB == $self];
1985	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2398	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1986		2399
1987	glDisable GL_TEXTURE_2D;	2400	glDisable GL_TEXTURE_2D;
1988		2401
1989	$self->SUPER::_draw;	2402	$self->SUPER::_draw;
1990	}	2403	}
1991		2404
1992	#############################################################################	2405	#############################################################################
1993		2406
		2407	package CFPlus::UI::CheckBox;
		2408
		2409	our @ISA = CFPlus::UI::DrawBG::;
		2410
		2411	my @tex =
		2412	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2413	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2414
		2415	use CFPlus::OpenGL;
		2416
		2417	sub new {
		2418	my $class = shift;
		2419
		2420	$class->SUPER::new (
		2421	padding_x => 2,
		2422	padding_y => 2,
		2423	fg => [1, 1, 1],
		2424	active_fg => [1, 1, 0],
		2425	bg => [0, 0, 0, 0.2],
		2426	active_bg => [1, 1, 1, 0.5],
		2427	state => 0,
		2428	can_hover => 1,
		2429	@_
		2430	)
		2431	}
		2432
		2433	sub size_request {
		2434	my ($self) = @_;
		2435
		2436	(6) x 2
		2437	}
		2438
		2439	sub toggle {
		2440	my ($self) = @_;
		2441
		2442	$self->{state} = !$self->{state};
		2443	$self->emit (changed => $self->{state});
		2444	$self->update;
		2445	}
		2446
		2447	sub invoke_button_down {
		2448	my ($self, $ev, $x, $y) = @_;
		2449
		2450	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2451	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2452	$self->toggle;
		2453	} else {
		2454	return 0
		2455	}
		2456
		2457	1
		2458	}
		2459
		2460	sub _draw {
		2461	my ($self) = @_;
		2462
		2463	$self->SUPER::_draw;
		2464
		2465	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2466
		2467	my ($w, $h) = @$self{qw(w h)};
		2468
		2469	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2470
		2471	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2472
		2473	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2474
		2475	glEnable GL_TEXTURE_2D;
		2476	$tex->draw_quad_alpha (0, 0, $s, $s);
		2477	glDisable GL_TEXTURE_2D;
		2478	}
		2479
		2480	#############################################################################
		2481
		2482	package CFPlus::UI::Image;
		2483
		2484	our @ISA = CFPlus::UI::Base::;
		2485
		2486	use CFPlus::OpenGL;
		2487
		2488	our %texture_cache;
		2489
		2490	sub new {
		2491	my $class = shift;
		2492
		2493	my $self = $class->SUPER::new (
		2494	can_events => 0,
		2495	@_,
		2496	);
		2497
		2498	$self->{path} || $self->{tex}
		2499	or Carp::croak "'path' or 'tex' attributes required";
		2500
		2501	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2502	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2503
		2504	CFPlus::weaken $texture_cache{$self->{path}};
		2505
		2506	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2507
		2508	$self
		2509	}
		2510
		2511	sub STORABLE_freeze {
		2512	my ($self, $cloning) = @_;
		2513
		2514	$self->{path}
		2515	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2516
		2517	$self->{path}
		2518	}
		2519
		2520	sub STORABLE_attach {
		2521	my ($self, $cloning, $path) = @_;
		2522
		2523	$self->new (path => $path)
		2524	}
		2525
		2526	sub size_request {
		2527	my ($self) = @_;
		2528
		2529	($self->{tex}{w}, $self->{tex}{h})
		2530	}
		2531
		2532	sub _draw {
		2533	my ($self) = @_;
		2534
		2535	my $tex = $self->{tex};
		2536
		2537	my ($w, $h) = ($self->{w}, $self->{h});
		2538
		2539	if ($self->{rot90}) {
		2540	glRotate 90, 0, 0, 1;
		2541	glTranslate 0, -$self->{w}, 0;
		2542
		2543	($w, $h) = ($h, $w);
		2544	}
		2545
		2546	glEnable GL_TEXTURE_2D;
		2547	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2548
		2549	$tex->draw_quad (0, 0, $w, $h);
		2550
		2551	glDisable GL_TEXTURE_2D;
		2552	}
		2553
		2554	#############################################################################
		2555
1994	package CFClient::UI::ImageButton;	2556	package CFPlus::UI::ImageButton;
1995		2557
1996	our @ISA = CFClient::UI::Image::;	2558	our @ISA = CFPlus::UI::Image::;
1997		2559
1998	use CFClient::OpenGL;	2560	use CFPlus::OpenGL;
1999		2561
2000	my %textures;	2562	my %textures;
2001		2563
2002	sub new {	2564	sub new {
2003	my $class = shift;	2565	my $class = shift;
…		…
2025	1	2587	1
2026	}	2588	}
2027		2589
2028	#############################################################################	2590	#############################################################################
2029		2591
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;	2592	package CFPlus::UI::VGauge;
2099		2593
2100	our @ISA = CFClient::UI::Base::;	2594	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		2595
2161	use List::Util qw(min max);	2596	use List::Util qw(min max);
2162		2597
2163	use CFClient::OpenGL;	2598	use CFPlus::OpenGL;
2164		2599
2165	my %tex = (	2600	my %tex = (
2166	food => [	2601	food => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2602	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2603	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169	],	2604	],
2170	grace => [	2605	grace => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2606	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/	2607	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173	],	2608	],
2174	hp => [	2609	hp => [
2175	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2610	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2611	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177	],	2612	],
2178	mana => [	2613	mana => [
2179	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2614	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/	2615	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181	],	2616	],
2182	);	2617	);
2183		2618
2184	# eg. VGauge->new (gauge => 'food'), default gauge: food	2619	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2244	my $ycut1 = max 0, min 1, $ycut;	2679	my $ycut1 = max 0, min 1, $ycut;
2245	my $ycut2 = max 0, min 1, $ycut - 1;	2680	my $ycut2 = max 0, min 1, $ycut - 1;
2246		2681
2247	my $h1 = $self->{h} * (1 - $ycut1);	2682	my $h1 = $self->{h} * (1 - $ycut1);
2248	my $h2 = $self->{h} * (1 - $ycut2);	2683	my $h2 = $self->{h} * (1 - $ycut2);
		2684	my $h3 = $self->{h};
		2685
		2686	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249		2687
2250	glEnable GL_BLEND;	2688	glEnable GL_BLEND;
2251	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2689	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2690	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253	glEnable GL_TEXTURE_2D;	2691	glEnable GL_TEXTURE_2D;
…		…
2272		2710
2273	if ($t3) {	2711	if ($t3) {
2274	glBindTexture GL_TEXTURE_2D, $t3->{name};	2712	glBindTexture GL_TEXTURE_2D, $t3->{name};
2275	glBegin GL_QUADS;	2713	glBegin GL_QUADS;
2276	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2714	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2715	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2716	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2717	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280	glEnd;	2718	glEnd;
2281	}	2719	}
2282		2720
2283	glDisable GL_BLEND;	2721	glDisable GL_BLEND;
2284	glDisable GL_TEXTURE_2D;	2722	glDisable GL_TEXTURE_2D;
2285	}	2723	}
2286		2724
2287	#############################################################################	2725	#############################################################################
2288		2726
2289	package CFClient::UI::Gauge;	2727	package CFPlus::UI::Gauge;
2290		2728
2291	our @ISA = CFClient::UI::VBox::;	2729	our @ISA = CFPlus::UI::VBox::;
2292		2730
2293	sub new {	2731	sub new {
2294	my ($class, %arg) = @_;	2732	my ($class, %arg) = @_;
2295		2733
2296	my $self = $class->SUPER::new (	2734	my $self = $class->SUPER::new (
…		…
2298	can_hover => 1,	2736	can_hover => 1,
2299	can_events => 1,	2737	can_events => 1,
2300	%arg,	2738	%arg,
2301	);	2739	);
2302		2740
2303	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2741	$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);	2742	$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");	2743	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306		2744
2307	$self	2745	$self
2308	}	2746	}
2309		2747
2310	sub set_fontsize {	2748	sub set_fontsize {
…		…
2331	$self->{value}->set_text ($val);	2769	$self->{value}->set_text ($val);
2332	}	2770	}
2333		2771
2334	#############################################################################	2772	#############################################################################
2335		2773
2336	package CFClient::UI::Slider;	2774	package CFPlus::UI::Slider;
2337		2775
2338	use strict;	2776	use strict;
2339		2777
2340	use CFClient::OpenGL;	2778	use CFPlus::OpenGL;
2341		2779
2342	our @ISA = CFClient::UI::DrawBG::;	2780	our @ISA = CFPlus::UI::DrawBG::;
2343		2781
2344	my @tex =	2782	my @tex =
2345	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2783	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346	qw(s1_slider.png s1_slider_bg.png);	2784	qw(s1_slider.png s1_slider_bg.png);
2347		2785
2348	sub new {	2786	sub new {
2349	my $class = shift;	2787	my $class = shift;
2350		2788
…		…
2439	}	2877	}
2440		2878
2441	1	2879	1
2442	}	2880	}
2443		2881
		2882	sub invoke_mouse_wheel {
		2883	my ($self, $ev) = @_;
		2884
		2885	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2886
		2887	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2888
		2889	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2890
		2891	! ! $delta
		2892	}
		2893
2444	sub update {	2894	sub update {
2445	my ($self) = @_;	2895	my ($self) = @_;
2446		2896
2447	delete $self->{knob_w};	2897	delete $self->{knob_w};
2448	$self->SUPER::update;	2898	$self->SUPER::update;
…		…
2495	glDisable GL_TEXTURE_2D;	2945	glDisable GL_TEXTURE_2D;
2496	}	2946	}
2497		2947
2498	#############################################################################	2948	#############################################################################
2499		2949
2500	package CFClient::UI::ValSlider;	2950	package CFPlus::UI::ValSlider;
2501		2951
2502	our @ISA = CFClient::UI::HBox::;	2952	our @ISA = CFPlus::UI::HBox::;
2503		2953
2504	sub new {	2954	sub new {
2505	my ($class, %arg) = @_;	2955	my ($class, %arg) = @_;
2506		2956
2507	my $range = delete $arg{range};	2957	my $range = delete $arg{range};
2508		2958
2509	my $self = $class->SUPER::new (	2959	my $self = $class->SUPER::new (
2510	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2960	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2961	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512	to_value => sub { shift },	2962	to_value => sub { shift },
2513	from_value => sub { shift },	2963	from_value => sub { shift },
2514	%arg,	2964	%arg,
2515	);	2965	);
2516		2966
…		…
2536	sub set_range { shift->{slider}->set_range (@_) }	2986	sub set_range { shift->{slider}->set_range (@_) }
2537	sub set_value { shift->{slider}->set_value (@_) }	2987	sub set_value { shift->{slider}->set_value (@_) }
2538		2988
2539	#############################################################################	2989	#############################################################################
2540		2990
2541	package CFClient::UI::TextScroller;	2991	package CFPlus::UI::TextScroller;
2542		2992
2543	our @ISA = CFClient::UI::HBox::;	2993	our @ISA = CFPlus::UI::HBox::;
2544		2994
2545	use CFClient::OpenGL;	2995	use CFPlus::OpenGL;
2546		2996
2547	sub new {	2997	sub new {
2548	my $class = shift;	2998	my $class = shift;
2549		2999
2550	my $self = $class->SUPER::new (	3000	my $self = $class->SUPER::new (
2551	fontsize => 1,	3001	fontsize => 1,
2552	can_events => 0,	3002	can_events => 1,
2553	indent => 0,	3003	indent => 0,
2554	#font => default_font	3004	#font => default_font
2555	@_,	3005	@_,
2556		3006
2557	layout => (new CFClient::Layout 1),	3007	layout => (new CFPlus::Layout),
2558	par => [],	3008	par => [],
		3009	max_par => 0,
2559	height => 0,	3010	height => 0,
2560	children => [	3011	children => [
2561	(new CFClient::UI::Empty expand => 1),	3012	(new CFPlus::UI::Empty expand => 1),
2562	(new CFClient::UI::Slider vertical => 1),	3013	(new CFPlus::UI::Slider vertical => 1),
2563	],	3014	],
2564	);	3015	);
2565		3016
2566	$self->{children}[1]->connect (changed => sub { $self->update });	3017	$self->{children}[1]->connect (changed => sub { $self->update });
2567		3018
…		…
2597		3048
2598	$self->reflow;	3049	$self->reflow;
2599		3050
2600	local $self->{children} = [$empty, $slider];	3051	local $self->{children} = [$empty, $slider];
2601	$self->SUPER::invoke_size_allocate ($w, $h)	3052	$self->SUPER::invoke_size_allocate ($w, $h)
		3053	}
		3054
		3055	sub invoke_mouse_wheel {
		3056	my ($self, $ev) = @_;
		3057
		3058	return 0 unless $ev->{dy}; # only vertical movements
		3059
		3060	$self->{children}[1]->emit (mouse_wheel => $ev);
		3061
		3062	1
2602	}	3063	}
2603		3064
2604	sub get_layout {	3065	sub get_layout {
2605	my ($self, $para) = @_;	3066	my ($self, $para) = @_;
2606		3067
…		…
2634		3095
2635	# todo: base offset on lines or so, not on pixels	3096	# todo: base offset on lines or so, not on pixels
2636	$self->{children}[1]->set_value ($offset);	3097	$self->{children}[1]->set_value ($offset);
2637	}	3098	}
2638		3099
		3100	sub current_paragraph {
		3101	my ($self) = @_;
		3102
		3103	$self->{top_paragraph} - 1
		3104	}
		3105
		3106	sub scroll_to {
		3107	my ($self, $para) = @_;
		3108
		3109	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3110
		3111	$self->{scroll_to} = $para;
		3112	$self->update;
		3113	}
		3114
2639	sub clear {	3115	sub clear {
2640	my ($self) = @_;	3116	my ($self) = @_;
2641		3117
2642	my (undef, undef, @other) = @{ $self->{children} };	3118	my (undef, undef, @other) = @{ $self->{children} };
2643	$self->remove ($_) for @other;	3119	$self->remove ($_) for @other;
…		…
2646	$self->{height} = 0;	3122	$self->{height} = 0;
2647	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3123	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648	}	3124	}
2649		3125
2650	sub add_paragraph {	3126	sub add_paragraph {
2651	my ($self, $color, $para, $indent) = @_;	3127	my $self = shift;
2652		3128
2653	my ($text, @w) = ref $para ? @$para : $para;	3129	for my $para (@_) {
2654
2655	$para = {	3130	$para = {
		3131	fg => [1, 1, 1, 1],
		3132	indent => 0,
		3133	markup => "",
		3134	widget => [],
		3135	ref $para ? %$para : (markup => $para),
2656	w => 1e10,	3136	w => 1e10,
2657	wrapped => 1,	3137	wrapped => 1,
2658	fg => $color,
2659	indent => $indent,
2660	markup => $text,
2661	widget => \@w,
2662	};	3138	};
2663		3139
2664	$self->add (@w) if @w;	3140	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665	push @{$self->{par}}, $para;	3141	push @{$self->{par}}, $para;
		3142	}
		3143
		3144	if (my $max = $self->{max_par}) {
		3145	shift @{$self->{par}} while @{$self->{par}} > $max;
		3146	}
2666		3147
2667	$self->{need_reflow}++;	3148	$self->{need_reflow}++;
2668	$self->update;	3149	$self->update;
2669	}	3150	}
2670		3151
2671	sub scroll_to_bottom {	3152	sub scroll_to_bottom {
2672	my ($self) = @_;	3153	my ($self) = @_;
2673		3154
2674	$self->{scroll_to_bottom} = 1;	3155	$self->{scroll_to} = $#{$self->{par}};
2675	$self->update;	3156	$self->update;
2676	}	3157	}
2677		3158
		3159	sub force_uptodate {
		3160	my ($self) = @_;
		3161
		3162	if (delete $self->{need_reflow}) {
		3163	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3164
		3165	my $height = 0;
		3166
		3167	for my $para (@{$self->{par}}) {
		3168	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3169	my $layout = $self->get_layout ($para);
		3170	my ($w, $h) = $layout->size;
		3171
		3172	$para->{w} = $w + $para->{indent};
		3173	$para->{h} = $h;
		3174	$para->{wrapped} = $layout->has_wrapped;
		3175	}
		3176
		3177	$para->{y} = $height;
		3178	$height += $para->{h};
		3179	}
		3180
		3181	$self->{height} = $height;
		3182	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3183
		3184	delete $self->{texture};
		3185	}
		3186
		3187	if (my $paridx = delete $self->{scroll_to}) {
		3188	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3189	}
		3190	}
		3191
2678	sub update {	3192	sub update {
2679	my ($self) = @_;	3193	my ($self) = @_;
2680		3194
2681	$self->SUPER::update;	3195	$self->SUPER::update;
2682		3196
2683	return unless $self->{h} > 0;	3197	return unless $self->{h} > 0;
2684		3198
2685	delete $self->{texture};	3199	delete $self->{texture};
2686		3200
2687	$ROOT->on_post_alloc ($self => sub {	3201	$ROOT->on_post_alloc ($self => sub {
		3202	$self->force_uptodate;
		3203
2688	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3204	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689		3205
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 {	3206	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718	glClearColor 0, 0, 0, 0;	3207	glClearColor 0, 0, 0, 0;
2719	glClear GL_COLOR_BUFFER_BIT;	3208	glClear GL_COLOR_BUFFER_BIT;
2720		3209
		3210	package CFPlus::UI::Base;
		3211	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3212	(0, 0, $self->{w}, $self->{h});
		3213
		3214	my $top = int $self->{children}[1]{range}[0];
		3215
		3216	my $paridx = 0;
		3217	my $top_paragraph;
2721	my $top = int $self->{children}[1]{range}[0];	3218	my $top = int $self->{children}[1]{range}[0];
2722		3219
2723	my $y0 = $top;	3220	my $y0 = $top;
2724	my $y1 = $top + $H;	3221	my $y1 = $top + $H;
2725		3222
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}}) {	3223	for my $para (@{$self->{par}}) {
2733	my $h = $para->{h};	3224	my $h = $para->{h};
		3225	my $y = $para->{y};
2734		3226
2735	if ($y0 < $y + $h && $y < $y1) {	3227	if ($y0 < $y + $h && $y < $y1) {
2736
2737	my $layout = $self->get_layout ($para);	3228	my $layout = $self->get_layout ($para);
2738		3229
2739	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741	glRasterPos $para->{indent}, $y - $y0;	3230	$layout->render ($para->{indent}, $y - $y0);
2742	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743		3231
2744	if (my @w = @{ $para->{widget} }) {	3232	if (my @w = @{ $para->{widget} }) {
2745	my @s = $layout->get_shapes;	3233	my @s = $layout->get_shapes;
2746		3234
2747	glDisable GL_BLEND;
2748	for (@w) {	3235	for (@w) {
2749	my ($dx, $dy) = splice @s, 0, 2, ();	3236	my ($dx, $dy) = splice @s, 0, 2, ();
2750		3237
2751	$_->{x} = $dx + $para->{indent};	3238	$_->{x} = $dx + $para->{indent};
2752	$_->{y} = $dy + $y - $y0;	3239	$_->{y} = $dy + $y - $y0;
2753		3240
2754	$_->draw;	3241	$_->draw;
2755	}	3242	}
2756	glEnable GL_BLEND;
2757	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2758	}	3243	}
2759	}	3244	}
2760		3245
2761	$y += $h;	3246	$paridx++;
		3247	$top_paragraph ||= $paridx if $y >= $top;
2762	}	3248	}
2763		3249
2764	glDisable GL_BLEND;	3250	$self->{top_paragraph} = $top_paragraph;
2765	};	3251	};
2766	});	3252	});
2767	}	3253	}
2768		3254
2769	sub reconfigure {	3255	sub reconfigure {
…		…
2787	$self->{children}[1]->draw;	3273	$self->{children}[1]->draw;
2788	}	3274	}
2789		3275
2790	#############################################################################	3276	#############################################################################
2791		3277
2792	package CFClient::UI::Animator;	3278	package CFPlus::UI::Animator;
2793		3279
2794	use CFClient::OpenGL;	3280	use CFPlus::OpenGL;
2795		3281
2796	our @ISA = CFClient::UI::Bin::;	3282	our @ISA = CFPlus::UI::Bin::;
2797		3283
2798	sub moveto {	3284	sub moveto {
2799	my ($self, $x, $y) = @_;	3285	my ($self, $x, $y) = @_;
2800		3286
2801	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3287	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2829	glPopMatrix;	3315	glPopMatrix;
2830	}	3316	}
2831		3317
2832	#############################################################################	3318	#############################################################################
2833		3319
2834	package CFClient::UI::Flopper;	3320	package CFPlus::UI::Flopper;
2835		3321
2836	our @ISA = CFClient::UI::Button::;	3322	our @ISA = CFPlus::UI::Button::;
2837		3323
2838	sub new {	3324	sub new {
2839	my $class = shift;	3325	my $class = shift;
2840		3326
2841	my $self = $class->SUPER::new (	3327	my $self = $class->SUPER::new (
…		…
2853	$self->{other}->toggle_visibility;	3339	$self->{other}->toggle_visibility;
2854	}	3340	}
2855		3341
2856	#############################################################################	3342	#############################################################################
2857		3343
2858	package CFClient::UI::Tooltip;	3344	package CFPlus::UI::Tooltip;
2859		3345
2860	our @ISA = CFClient::UI::Bin::;	3346	our @ISA = CFPlus::UI::Bin::;
2861		3347
2862	use CFClient::OpenGL;	3348	use CFPlus::OpenGL;
2863		3349
2864	sub new {	3350	sub new {
2865	my $class = shift;	3351	my $class = shift;
2866		3352
2867	$class->SUPER::new (	3353	$class->SUPER::new (
…		…
2870	)	3356	)
2871	}	3357	}
2872		3358
2873	sub set_tooltip_from {	3359	sub set_tooltip_from {
2874	my ($self, $widget) = @_;	3360	my ($self, $widget) = @_;
		3361
		3362	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3363	if $widget->{tooltip} =~ /^#(.*)$/;
2875		3364
2876	my $tooltip = $widget->{tooltip};	3365	my $tooltip = $widget->{tooltip};
2877		3366
2878	if ($ENV{CFPLUS_DEBUG} & 2) {	3367	if ($ENV{CFPLUS_DEBUG} & 2) {
2879	$tooltip .= "\n\n" . (ref $widget) . "\n"	3368	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2883	}	3372	}
2884		3373
2885	$tooltip =~ s/^\n+//;	3374	$tooltip =~ s/^\n+//;
2886	$tooltip =~ s/\n+$//;	3375	$tooltip =~ s/\n+$//;
2887		3376
2888	$self->add (new CFClient::UI::Label	3377	$self->add (new CFPlus::UI::Label
2889	markup => $tooltip,	3378	markup => $tooltip,
2890	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3379	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891	fontsize => 0.8,	3380	fontsize => 0.8,
2892	fg => [0, 0, 0, 1],	3381	style => 1, # FLAG_INVERSE
2893	ellipsise => 0,	3382	ellipsise => 0,
2894	font => ($widget->{tooltip_font} || $::FONT_PROP),	3383	font => ($widget->{tooltip_font} || $::FONT_PROP),
2895	);	3384	);
2896	}	3385	}
2897		3386
…		…
2916		3405
2917	$self->{root}->on_post_alloc ("move_$self" => sub {	3406	$self->{root}->on_post_alloc ("move_$self" => sub {
2918	my $widget = $self->{owner}	3407	my $widget = $self->{owner}
2919	or return;	3408	or return;
2920		3409
		3410	if ($widget->{visible}) {
2921	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3411	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922		3412
2923	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3413	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924	if $x + $self->{w} > $self->{root}{w};	3414	if $x + $self->{w} > $self->{root}{w};
2925		3415
2926	$self->move_abs ($x, $y);	3416	$self->move_abs ($x, $y);
		3417	} else {
		3418	$self->hide;
		3419	}
2927	});	3420	});
2928	}	3421	}
2929		3422
2930	sub _draw {	3423	sub _draw {
2931	my ($self) = @_;	3424	my ($self) = @_;
…		…
2955	$self->SUPER::_draw;	3448	$self->SUPER::_draw;
2956	}	3449	}
2957		3450
2958	#############################################################################	3451	#############################################################################
2959		3452
2960	package CFClient::UI::Face;	3453	package CFPlus::UI::Face;
2961		3454
2962	our @ISA = CFClient::UI::Base::;	3455	our @ISA = CFPlus::UI::DrawBG::;
2963		3456
2964	use CFClient::OpenGL;	3457	use CFPlus::OpenGL;
2965		3458
2966	sub new {	3459	sub new {
2967	my $class = shift;	3460	my $class = shift;
2968		3461
2969	my $self = $class->SUPER::new (	3462	my $self = $class->SUPER::new (
		3463	size_w => 32,
		3464	size_h => 8,
2970	aspect => 1,	3465	aspect => 1,
2971	can_events => 0,	3466	can_events => 0,
2972	@_,	3467	@_,
2973	);	3468	);
2974		3469
2975	if ($self->{anim} && $self->{animspeed}) {	3470	if ($self->{anim} && $self->{animspeed}) {
2976	Scalar::Util::weaken (my $widget = $self);	3471	CFPlus::weaken (my $widget = $self);
2977		3472
		3473	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3474	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2978	$self->{timer} = Event->timer (	3475	$self->{timer} = Event->timer (
2979	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2980	hard => 1,	3476	parked => 1,
2981	interval => $self->{animspeed},
2982	cb => sub {	3477	cb => sub {
		3478	return unless $::CONN && $widget;
		3479
2983	++$widget->{frame};	3480	++$widget->{frame};
		3481	$widget->update_face;
2984	$widget->update;	3482	$widget->update;
		3483
		3484	$widget->update_timer;
2985	},	3485	},
2986	);	3486	);
		3487
		3488	$self->update_face;
		3489	$self->update_timer;
2987	}	3490	}
2988		3491
2989	$self	3492	$self
2990	}	3493	}
2991		3494
		3495	sub update_timer {
		3496	my ($self) = @_;
		3497
		3498	return unless $self->{timer};
		3499
		3500	if ($self->{visible}) {
		3501	$self->{timer}->at (
		3502	$self->{anim_start}
		3503	+ $self->{animspeed}
		3504	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3505	);
		3506	$self->{timer}->start;
		3507	} else {
		3508	$self->{timer}->stop;
		3509	}
		3510	}
		3511
		3512	sub update_face {
		3513	my ($self) = @_;
		3514
		3515	return unless $::CONN;
		3516
		3517	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3518	if ($anim && @$anim) {
		3519	delete $self->{wait_face};
		3520	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3521	}
		3522	}
		3523	}
		3524
2992	sub size_request {	3525	sub size_request {
2993	(32, 8)	3526	my ($self) = @_;
		3527
		3528	if ($::CONN) {
		3529	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3530	if (my $tex = $::CONN->{texture}[$faceid]) {
		3531	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3532	} else {
		3533	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3534	$self->realloc;
		3535	});
		3536	}
		3537	}
		3538	}
		3539
		3540	($self->{size_w} || 8, $self->{size_h} || 8)
2994	}	3541	}
2995		3542
2996	sub update {	3543	sub update {
2997	my ($self) = @_;	3544	my ($self) = @_;
2998		3545
2999	return unless $self->{visible};	3546	return unless $self->{visible};
3000		3547
3001	$self->SUPER::update;	3548	$self->SUPER::update;
3002	}	3549	}
3003		3550
		3551	sub invoke_visibility_change {
		3552	my ($self) = @_;
		3553
		3554	$self->update_timer;
		3555
		3556	0
		3557	}
		3558
3004	sub _draw {	3559	sub _draw {
3005	my ($self) = @_;	3560	my ($self) = @_;
3006		3561
3007	return unless $::CONN;	3562	return unless $::CONN;
3008		3563
3009	my $face;	3564	$self->SUPER::_draw;
3010		3565
3011	if ($self->{frame}) {
3012	my $anim = $::CONN->{anim}[$self->{anim}];	3566	my $faceid = $::CONN->{faceid}[$self->{face}]
3013		3567	or return;
3014	$face = $anim->[ $self->{frame} % @$anim ]
3015	if $anim && @$anim;
3016	}
3017		3568
3018	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3569	my $tex = $::CONN->{texture}[$faceid];
3019		3570
3020	if ($tex) {	3571	if ($tex) {
3021	glEnable GL_TEXTURE_2D;	3572	glEnable GL_TEXTURE_2D;
3022	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3573	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3023	glColor 0, 0, 0, 1;	3574	glColor 0, 0, 0, 1;
…		…
3027	}	3578	}
3028		3579
3029	sub destroy {	3580	sub destroy {
3030	my ($self) = @_;	3581	my ($self) = @_;
3031		3582
3032	$self->{timer}->cancel	3583	(delete $self->{timer})->cancel
3033	if $self->{timer};	3584	if $self->{timer};
3034		3585
3035	$self->SUPER::destroy;	3586	$self->SUPER::destroy;
3036	}	3587	}
3037		3588
3038	#############################################################################	3589	#############################################################################
3039		3590
3040	package CFClient::UI::Buttonbar;	3591	package CFPlus::UI::Buttonbar;
3041		3592
3042	our @ISA = CFClient::UI::HBox::;	3593	our @ISA = CFPlus::UI::HBox::;
3043		3594
3044	# TODO: should actualyl wrap buttons and other goodies.	3595	# TODO: should actually wrap buttons and other goodies.
3045		3596
3046	#############################################################################	3597	#############################################################################
3047		3598
3048	package CFClient::UI::Menu;	3599	package CFPlus::UI::Menu;
3049		3600
3050	our @ISA = CFClient::UI::FancyFrame::;	3601	our @ISA = CFPlus::UI::Toplevel::;
3051		3602
3052	use CFClient::OpenGL;	3603	use CFPlus::OpenGL;
3053		3604
3054	sub new {	3605	sub new {
3055	my $class = shift;	3606	my $class = shift;
3056		3607
3057	my $self = $class->SUPER::new (	3608	my $self = $class->SUPER::new (
3058	items => [],	3609	items => [],
3059	z => 100,	3610	z => 100,
3060	@_,	3611	@_,
3061	);	3612	);
3062		3613
3063	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3614	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064		3615
3065	for my $item (@{ $self->{items} }) {	3616	for my $item (@{ $self->{items} }) {
3066	my ($widget, $cb, $tooltip) = @$item;	3617	my ($widget, $cb, $tooltip) = @$item;
3067		3618
3068	# handle various types of items, only text for now	3619	# handle various types of items, only text for now
3069	if (!ref $widget) {	3620	if (!ref $widget) {
		3621	if ($widget =~ /\t/) {
		3622	my ($left, $right) = split /\t/, $widget, 2;
		3623
3070	$widget = new CFClient::UI::Label	3624	$widget = new CFPlus::UI::HBox
3071	can_hover => 1,	3625	can_hover => 1,
3072	can_events => 1,	3626	can_events => 1,
		3627	tooltip => $tooltip,
		3628	children => [
		3629	(new CFPlus::UI::Label markup => $left, expand => 1),
		3630	(new CFPlus::UI::Label markup => $right, align => +1),
		3631	],
		3632	;
		3633
		3634	} else {
		3635	$widget = new CFPlus::UI::Label
		3636	can_hover => 1,
		3637	can_events => 1,
3073	markup => $widget,	3638	markup => $widget,
3074	tooltip => $tooltip	3639	tooltip => $tooltip;
		3640	}
3075	}	3641	}
3076		3642
3077	$self->{item}{$widget} = $item;	3643	$self->{item}{$widget} = $item;
3078		3644
3079	$self->{vbox}->add ($widget);	3645	$self->{vbox}->add ($widget);
…		…
3122	1	3688	1
3123	}	3689	}
3124		3690
3125	#############################################################################	3691	#############################################################################
3126		3692
3127	package CFClient::UI::Multiplexer;	3693	package CFPlus::UI::Multiplexer;
3128		3694
3129	our @ISA = CFClient::UI::Container::;	3695	our @ISA = CFPlus::UI::Container::;
3130		3696
3131	sub new {	3697	sub new {
3132	my $class = shift;	3698	my $class = shift;
3133		3699
3134	my $self = $class->SUPER::new (	3700	my $self = $class->SUPER::new (
…		…
3148		3714
3149	$self->{current} = $self->{children}[0]	3715	$self->{current} = $self->{children}[0]
3150	if @{ $self->{children} };	3716	if @{ $self->{children} };
3151	}	3717	}
3152		3718
		3719	sub get_current_page {
		3720	my ($self) = @_;
		3721
		3722	$self->{current}
		3723	}
		3724
3153	sub set_current_page {	3725	sub set_current_page {
3154	my ($self, $page_or_widget) = @_;	3726	my ($self, $page_or_widget) = @_;
3155		3727
3156	my $widget = ref $page_or_widget	3728	my $widget = ref $page_or_widget
3157	? $page_or_widget	3729	? $page_or_widget
…		…
3189	$self->{current}->draw;	3761	$self->{current}->draw;
3190	}	3762	}
3191		3763
3192	#############################################################################	3764	#############################################################################
3193		3765
3194	package CFClient::UI::Notebook;	3766	package CFPlus::UI::Notebook;
3195		3767
3196	our @ISA = CFClient::UI::VBox::;	3768	our @ISA = CFPlus::UI::VBox::;
3197		3769
3198	sub new {	3770	sub new {
3199	my $class = shift;	3771	my $class = shift;
3200		3772
3201	my $self = $class->SUPER::new (	3773	my $self = $class->SUPER::new (
3202	buttonbar => (new CFClient::UI::Buttonbar),	3774	buttonbar => (new CFPlus::UI::Buttonbar),
3203	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3775	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3204	# filter => # will be put between multiplexer and $self	3776	# filter => # will be put between multiplexer and $self
3205	@_,	3777	@_,
3206	);	3778	);
3207		3779
3208	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3780	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3212	}	3784	}
3213		3785
3214	sub add {	3786	sub add {
3215	my ($self, $title, $widget, $tooltip) = @_;	3787	my ($self, $title, $widget, $tooltip) = @_;
3216		3788
3217	Scalar::Util::weaken $self;	3789	CFPlus::weaken $self;
3218		3790
3219	$self->{buttonbar}->add (new CFClient::UI::Button	3791	$self->{buttonbar}->add (new CFPlus::UI::Button
3220	markup => $title,	3792	markup => $title,
3221	tooltip => $tooltip,	3793	tooltip => $tooltip,
3222	on_activate => sub { $self->set_current_page ($widget) },	3794	on_activate => sub { $self->set_current_page ($widget) },
3223	);	3795	);
3224		3796
3225	$self->{multiplexer}->add ($widget);	3797	$self->{multiplexer}->add ($widget);
3226	}	3798	}
3227		3799
		3800	sub get_current_page {
		3801	my ($self) = @_;
		3802
		3803	$self->{multiplexer}->get_current_page
		3804	}
		3805
3228	sub set_current_page {	3806	sub set_current_page {
3229	my ($self, $page) = @_;	3807	my ($self, $page) = @_;
3230		3808
3231	$self->{multiplexer}->set_current_page ($page);	3809	$self->{multiplexer}->set_current_page ($page);
3232	$self->emit (page_changed => $self->{multiplexer}{current});	3810	$self->emit (page_changed => $self->{multiplexer}{current});
3233	}	3811	}
3234		3812
3235	#############################################################################	3813	#############################################################################
3236		3814
3237	package CFClient::UI::Combobox;	3815	package CFPlus::UI::Selector;
3238		3816
3239	use utf8;	3817	use utf8;
3240		3818
3241	our @ISA = CFClient::UI::Button::;	3819	our @ISA = CFPlus::UI::Button::;
3242		3820
3243	sub new {	3821	sub new {
3244	my $class = shift;	3822	my $class = shift;
3245		3823
3246	my $self = $class->SUPER::new (	3824	my $self = $class->SUPER::new (
…		…
3263	my ($value, $title, $tooltip) = @$_;	3841	my ($value, $title, $tooltip) = @$_;
3264		3842
3265	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3843	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3266	}	3844	}
3267		3845
3268	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3846	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3269	}	3847	}
3270		3848
3271	sub _set_value {	3849	sub _set_value {
3272	my ($self, $value) = @_;	3850	my ($self, $value) = @_;
3273		3851
…		…
3288	$self->emit (changed => $value);	3866	$self->emit (changed => $value);
3289	}	3867	}
3290		3868
3291	#############################################################################	3869	#############################################################################
3292		3870
3293	package CFClient::UI::Statusbox;	3871	package CFPlus::UI::Statusbox;
3294		3872
3295	our @ISA = CFClient::UI::VBox::;	3873	our @ISA = CFPlus::UI::VBox::;
3296		3874
3297	sub new {	3875	sub new {
3298	my $class = shift;	3876	my $class = shift;
3299		3877
3300	my $self = $class->SUPER::new (	3878	my $self = $class->SUPER::new (
3301	fontsize => 0.8,	3879	fontsize => 0.8,
3302	@_,	3880	@_,
3303	);	3881	);
3304		3882
3305	Scalar::Util::weaken (my $this = $self);	3883	CFPlus::weaken (my $this = $self);
3306		3884
3307	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3885	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3308		3886
3309	$self	3887	$self
3310	}	3888	}
…		…
3312	sub reorder {	3890	sub reorder {
3313	my ($self) = @_;	3891	my ($self) = @_;
3314	my $NOW = Time::HiRes::time;	3892	my $NOW = Time::HiRes::time;
3315		3893
3316	# freeze display when hovering over any label	3894	# freeze display when hovering over any label
3317	return if $CFClient::UI::TOOLTIP->{owner}	3895	return if $CFPlus::UI::TOOLTIP->{owner}
3318	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3896	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3319	values %{ $self->{item} };	3897	values %{ $self->{item} };
3320		3898
3321	while (my ($k, $v) = each %{ $self->{item} }) {	3899	while (my ($k, $v) = each %{ $self->{item} }) {
3322	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3900	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3323	}	3901	}
…		…
3344	for ($short) {	3922	for ($short) {
3345	s/^\s+//;	3923	s/^\s+//;
3346	s/\s+/ /g;	3924	s/\s+/ /g;
3347	}	3925	}
3348		3926
3349	new CFClient::UI::Label	3927	new CFPlus::UI::Label
3350	markup => $short,	3928	markup => $short,
3351	tooltip => $item->{tooltip},	3929	tooltip => $item->{tooltip},
3352	tooltip_font => $::FONT_PROP,	3930	tooltip_font => $::FONT_PROP,
3353	tooltip_width => 0.67,	3931	tooltip_width => 0.67,
3354	fontsize => $item->{fontsize} || $self->{fontsize},	3932	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3408	count => 1,	3986	count => 1,
3409	%arg,	3987	%arg,
3410	};	3988	};
3411	}	3989	}
3412		3990
		3991	$ROOT->on_refresh (reorder => sub {
3413	$self->reorder;	3992	$self->reorder;
		3993	});
3414	}	3994	}
3415		3995
3416	sub reconfigure {	3996	sub reconfigure {
3417	my ($self) = @_;	3997	my ($self) = @_;
3418		3998
…		…
3431	$self->SUPER::destroy;	4011	$self->SUPER::destroy;
3432	}	4012	}
3433		4013
3434	#############################################################################	4014	#############################################################################
3435		4015
3436	package CFClient::UI::Inventory;
3437
3438	our @ISA = CFClient::UI::ScrolledWindow::;
3439
3440	sub new {
3441	my $class = shift;
3442
3443	my $self = $class->SUPER::new (
3444	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3445	@_,
3446	);
3447
3448	$self
3449	}
3450
3451	sub set_items {
3452	my ($self, $items) = @_;
3453
3454	$self->{child}->clear;
3455	return unless $items;
3456
3457	my @items = sort {
3458	($a->{type} <=> $b->{type})
3459	or ($a->{name} cmp $b->{name})
3460	} @$items;
3461
3462	$self->{real_items} = \@items;
3463
3464	my $row = 0;
3465	for my $item (@items) {
3466	CFClient::Item::update_widgets $item;
3467
3468	$self->{child}->add (0, $row, $item->{face_widget});
3469	$self->{child}->add (1, $row, $item->{desc_widget});
3470	$self->{child}->add (2, $row, $item->{weight_widget});
3471
3472	$row++;
3473	}
3474	}
3475
3476	#############################################################################
3477
3478	package CFClient::UI::BindEditor;
3479
3480	our @ISA = CFClient::UI::FancyFrame::;
3481
3482	sub new {
3483	my $class = shift;
3484
3485	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3486
3487	$self->add (my $vb = new CFClient::UI::VBox);
3488
3489
3490	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3491	text => "start recording",
3492	tooltip => "Start/Stops recording of actions."
3493	."All subsequent actions after the recording started will be captured."
3494	."The actions are displayed after the record was stopped."
3495	."To bind the action you have to click on the 'Bind' button",
3496	on_activate => sub {
3497	unless ($self->{recording}) {
3498	$self->start;
3499	} else {
3500	$self->stop;
3501	}
3502	});
3503
3504	$vb->add (new CFClient::UI::Label text => "Actions:");
3505	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3506
3507	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3508	$vb->add (my $hb = new CFClient::UI::HBox);
3509	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3510	$hb->add (new CFClient::UI::Button
3511	text => "bind",
3512	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3513	on_activate => sub {
3514	$self->ask_for_bind;
3515	});
3516
3517	$vb->add (my $hb = new CFClient::UI::HBox);
3518	$hb->add (new CFClient::UI::Button
3519	text => "ok",
3520	expand => 1,
3521	tooltip => "This closes the binding editor and saves the binding",
3522	on_activate => sub {
3523	$self->hide;
3524	$self->commit;
3525	});
3526
3527	$hb->add (new CFClient::UI::Button
3528	text => "cancel",
3529	expand => 1,
3530	tooltip => "This closes the binding editor without saving",
3531	on_activate => sub {
3532	$self->hide;
3533	$self->{binding_cancel}->()
3534	if $self->{binding_cancel};
3535	});
3536
3537	$self->update_binding_widgets;
3538
3539	$self
3540	}
3541
3542	sub cfg_bind {
3543	my ($self, $mod, $sym, $cmds) = @_;
3544	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3545	::update_bindings ();
3546	}
3547
3548	sub cfg_unbind {
3549	my ($self, $mod, $sym, $cmds) = @_;
3550	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3551	::update_bindings ();
3552	}
3553
3554	sub commit {
3555	my ($self) = @_;
3556	my ($mod, $sym, $cmds) = $self->get_binding;
3557	if ($sym != 0 && @$cmds > 0) {
3558	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3559	."'. Don't forget 'Save Config'!");
3560	$self->{binding_change}->($mod, $sym, $cmds)
3561	if $self->{binding_change};
3562	} else {
3563	$::STATUSBOX->add ("No action bound, no key or action specified!");
3564	$self->{binding_cancel}->()
3565	if $self->{binding_cancel};
3566	}
3567	}
3568
3569	sub start {
3570	my ($self) = @_;
3571
3572	$self->{rec_btn}->set_text ("stop recording");
3573	$self->{recording} = 1;
3574	$self->clear_command_list;
3575	$::CONN->start_record if $::CONN;
3576	}
3577
3578	sub stop {
3579	my ($self) = @_;
3580
3581	$self->{rec_btn}->set_text ("start recording");
3582	$self->{recording} = 0;
3583
3584	my $rec;
3585	$rec = $::CONN->stop_record if $::CONN;
3586	return unless ref $rec eq 'ARRAY';
3587	$self->set_command_list ($rec);
3588	}
3589
3590
3591	sub ask_for_bind_and_commit {
3592	my ($self) = @_;
3593	$self->ask_for_bind (1);
3594	}
3595
3596	sub ask_for_bind {
3597	my ($self, $commit, $end_cb) = @_;
3598
3599	CFClient::Binder::open_binding_dialog (sub {
3600	my ($mod, $sym) = @_;
3601	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3602	$self->update_binding_widgets;
3603	$self->commit if $commit;
3604	$end_cb->() if $end_cb;
3605	});
3606	}
3607
3608	# $mod and $sym are the modifiers and key symbol
3609	# $cmds is a array ref of strings (the commands)
3610	# $cb is the callback that is executed on OK
3611	# $ccb is the callback that is executed on CANCEL and
3612	# when the binding was unsuccessful on OK
3613	sub set_binding {
3614	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3615
3616	$self->clear_command_list;
3617	$self->{recording} = 0;
3618	$self->{rec_btn}->set_text ("start recording");
3619
3620	$self->{binding} = [$mod, $sym];
3621	$self->{commands} = $cmds;
3622
3623	$self->{binding_change} = $cb;
3624	$self->{binding_cancel} = $ccb;
3625
3626	$self->update_binding_widgets;
3627	}
3628
3629	# this is a shortcut method that asks for a binding
3630	# and then just binds it.
3631	sub do_quick_binding {
3632	my ($self, $cmds, $end_cb) = @_;
3633	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3634	$self->ask_for_bind (1, $end_cb);
3635	}
3636
3637	sub update_binding_widgets {
3638	my ($self) = @_;
3639	my ($mod, $sym, $cmds) = $self->get_binding;
3640	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3641	$self->set_command_list ($cmds);
3642	}
3643
3644	sub get_binding {
3645	my ($self) = @_;
3646	return (
3647	$self->{binding}->[0],
3648	$self->{binding}->[1],
3649	[ grep { defined $_ } @{$self->{commands}} ]
3650	);
3651	}
3652
3653	sub clear_command_list {
3654	my ($self) = @_;
3655	$self->{cmdbox}->clear ();
3656	}
3657
3658	sub set_command_list {
3659	my ($self, $cmds) = @_;
3660
3661	$self->{cmdbox}->clear ();
3662	$self->{commands} = $cmds;
3663
3664	my $idx = 0;
3665
3666	for (@$cmds) {
3667	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3668
3669	my $i = $idx;
3670	$hb->add (new CFClient::UI::Label text => $_);
3671	$hb->add (new CFClient::UI::Button
3672	text => "delete",
3673	tooltip => "Deletes the action from the record",
3674	on_activate => sub {
3675	$self->{cmdbox}->remove ($hb);
3676	$cmds->[$i] = undef;
3677	});
3678
3679
3680	$idx++
3681	}
3682	}
3683
3684	#############################################################################
3685
3686	package CFClient::UI::SpellList;
3687
3688	our @ISA = CFClient::UI::Table::;
3689
3690	sub new {
3691	my $class = shift;
3692
3693	my $self = $class->SUPER::new (
3694	binding => [],
3695	commands => [],
3696	@_,
3697	)
3698	}
3699
3700	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3701
3702	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3703	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3704	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3705	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3706	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3707	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3708	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3709	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3710	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3711	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3712
3713	sub rebuild_spell_list {
3714	my ($self) = @_;
3715
3716	$CFClient::UI::ROOT->on_refresh ($self => sub {
3717	$self->clear;
3718
3719	return unless $::CONN;
3720
3721	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3722	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3723	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3724	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3725	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3726
3727	my $row = 0;
3728
3729	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3730	my $spell = $self->{spell}{$_};
3731
3732	$row++;
3733
3734	my $spell_cb = sub {
3735	my ($widget, $ev) = @_;
3736
3737	if ($ev->{button} == 1) {
3738	$::CONN->user_send ("cast $spell->{name}");
3739	} elsif ($ev->{button} == 2) {
3740	$::CONN->user_send ("invoke $spell->{name}");
3741	} elsif ($ev->{button} == 3) {
3742	(new CFClient::UI::Menu
3743	items => [
3744	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3745	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3746	],
3747	)->popup ($ev);
3748	} else {
3749	return 0;
3750	}
3751
3752	1
3753	};
3754
3755	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3756
3757	#TODO: add path info to tooltip
3758	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3759
3760	$self->add (0, $row, new CFClient::UI::Face
3761	face => $spell->{face},
3762	can_hover => 1,
3763	can_events => 1,
3764	tooltip => $tooltip,
3765	on_button_down => $spell_cb,
3766	);
3767
3768	$self->add (1, $row, new CFClient::UI::Label
3769	expand => 1,
3770	text => $spell->{name},
3771	can_hover => 1,
3772	can_events => 1,
3773	tooltip => $tooltip,
3774	on_button_down => $spell_cb,
3775	);
3776
3777	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3778	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3779	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3780	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3781	}
3782	});
3783	}
3784
3785	sub add_spell {
3786	my ($self, $spell) = @_;
3787
3788	$self->{spell}->{$spell->{name}} = $spell;
3789	$self->rebuild_spell_list;
3790	}
3791
3792	sub remove_spell {
3793	my ($self, $spell) = @_;
3794
3795	delete $self->{spell}->{$spell->{name}};
3796	$self->rebuild_spell_list;
3797	}
3798
3799	sub clear_spells {
3800	my ($self) = @_;
3801
3802	$self->{spell} = {};
3803	$self->rebuild_spell_list;
3804	}
3805
3806	#############################################################################
3807
3808	package CFClient::UI::Root;	4016	package CFPlus::UI::Root;
3809		4017
3810	our @ISA = CFClient::UI::Container::;	4018	our @ISA = CFPlus::UI::Container::;
3811		4019
3812	use List::Util qw(min max);	4020	use List::Util qw(min max);
3813		4021
3814	use CFClient::OpenGL;	4022	use CFPlus::OpenGL;
3815		4023
3816	sub new {	4024	sub new {
3817	my $class = shift;	4025	my $class = shift;
3818		4026
3819	my $self = $class->SUPER::new (	4027	my $self = $class->SUPER::new (
3820	visible => 1,	4028	visible => 1,
3821	@_,	4029	@_,
3822	);	4030	);
3823		4031
3824	Scalar::Util::weaken ($self->{root} = $self);	4032	CFPlus::weaken ($self->{root} = $self);
3825		4033
3826	$self	4034	$self
3827	}	4035	}
3828		4036
3829	sub size_request {	4037	sub size_request {
…		…
3995	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4203	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3996		4204
3997	$w = 0 if $w < 0;	4205	$w = 0 if $w < 0;
3998	$h = 0 if $h < 0;	4206	$h = 0 if $h < 0;
3999		4207
		4208	$w = max $widget->{min_w}, $w;
		4209	$h = max $widget->{min_h}, $h;
		4210
		4211	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4212	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4213
		4214	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4215	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4216
4000	$w = int $w + 0.5;	4217	$w = int $w + 0.5;
4001	$h = int $h + 0.5;	4218	$h = int $h + 0.5;
4002		4219
4003	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4220	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4004	$widget->{old_w} = $widget->{w};	4221	$widget->{old_w} = $widget->{w};
…		…
4014		4231
4015	while ($self->{post_alloc_hook}) {	4232	while ($self->{post_alloc_hook}) {
4016	$_->()	4233	$_->()
4017	for values %{delete $self->{post_alloc_hook}};	4234	for values %{delete $self->{post_alloc_hook}};
4018	}	4235	}
4019
4020		4236
4021	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4237	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4022	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4238	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4023	glClear GL_COLOR_BUFFER_BIT;	4239	glClear GL_COLOR_BUFFER_BIT;
4024		4240
…		…
4027	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4243	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4028	glMatrixMode GL_MODELVIEW;	4244	glMatrixMode GL_MODELVIEW;
4029	glLoadIdentity;	4245	glLoadIdentity;
4030		4246
4031	{	4247	{
4032	package CFClient::UI::Base;	4248	package CFPlus::UI::Base;
4033		4249
4034	($draw_x, $draw_y, $draw_w, $draw_h) =	4250	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4035	(0, 0, $self->{w}, $self->{h});	4251	(0, 0, $self->{w}, $self->{h});
4036	}
4037		4252
4038	$self->_draw;	4253	$self->_draw;
		4254	}
4039	}	4255	}
4040		4256
4041	#############################################################################	4257	#############################################################################
4042		4258
4043	package CFClient::UI;	4259	package CFPlus::UI;
4044		4260
4045	$ROOT = new CFClient::UI::Root;	4261	$ROOT = new CFPlus::UI::Root;
4046	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4262	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4047		4263
4048	1	4264	1
4049		4265

Diff Legend

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