ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.312 by root, Fri Jun 23 23:54:30 2006 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 2007 UTC

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

Diff Legend

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