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.316 by root, Sun Jul 2 13:57:58 2006 UTC vs.
Revision 1.403 by root, Sat Jul 21 21:25:23 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	on_size_allocate => sub {
		1100	my ($vp, $w, $h) = @_;
		1101	$vp->{parent}->update_slider;
		1102	0
		1103	},
		1104	;
		1105
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1106	$self->SUPER::add ($self->{vp});
		1107
986	$self->add ($child) if $child;	1108	$self->add ($child) if $child;
987		1109
988	$self	1110	$self
989	}	1111	}
990
991	#TODO# update range on size_allocate depending on child
992		1112
993	sub add {	1113	sub add {
994	my ($self, $widget) = @_;	1114	my ($self, $widget) = @_;
995		1115
996	$self->{vp}->add ($self->{child} = $widget);	1116	$self->{vp}->add ($self->{child} = $widget);
997	}	1117	}
998		1118
999	sub update_slider {	1119	sub update_slider {
1000	my ($self) = @_;	1120	my ($self) = @_;
1001		1121
		1122	my $child = ($self->{vp} or return)->child;
		1123
		1124	if ($self->{scroll_x}) {
		1125	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1126	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1003	}
1004		1127
1005	sub update {	1128	my $visible = $w1 > $w2;
		1129	if ($visible != $self->{hslider_visible}) {
		1130	$self->{hslider_visible} = $visible;
		1131	$visible ? $self->SUPER::add ($self->{hslider})
		1132	: $self->SUPER::remove ($self->{hslider});
		1133	}
		1134	}
		1135
		1136	if ($self->{scroll_y}) {
		1137	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1138	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1139
		1140	my $visible = $h1 > $h2;
		1141	if ($visible != $self->{vslider_visible}) {
		1142	$self->{vslider_visible} = $visible;
		1143	$visible ? $self->SUPER::add ($self->{vslider})
		1144	: $self->SUPER::remove ($self->{vslider});
		1145	}
		1146	}
		1147	}
		1148
		1149	sub start_dragging {
1006	my ($self) = @_;	1150	my ($self, $ev) = @_;
1007		1151
1008	$self->SUPER::update;	1152	$self->grab_focus;
1009		1153
1010	$self->update_slider;	1154	my $ox = $self->{vp}{view_x};
		1155	my $oy = $self->{vp}{view_y};
		1156
		1157	$self->{motion} = sub {
		1158	my ($ev, $x, $y) = @_;
		1159
		1160	$ox -= $ev->{xrel};
		1161	$oy -= $ev->{yrel};
		1162
		1163	$self->{vp}->set_offset ($ox, $oy);
		1164	};
		1165	}
		1166
		1167	sub invoke_mouse_wheel {
		1168	my ($self, $ev) = @_;
		1169
		1170	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1171	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1172
		1173	1
		1174	}
		1175
		1176	sub invoke_button_down {
		1177	my ($self, $ev, $x, $y) = @_;
		1178
		1179	if ($ev->{button} == 2) {
		1180	$self->start_dragging ($ev);
		1181	return 1;
		1182	}
		1183
		1184	0
		1185	}
		1186
		1187	sub invoke_button_up {
		1188	my ($self, $ev, $x, $y) = @_;
		1189
		1190	if (delete $self->{motion}) {
		1191	return 1;
		1192	}
		1193
		1194	0
		1195	}
		1196
		1197	sub invoke_mouse_motion {
		1198	my ($self, $ev, $x, $y) = @_;
		1199
		1200	if ($self->{motion}) {
		1201	$self->{motion}->($ev, $x, $y);
		1202	return 1;
		1203	}
		1204
		1205	0
1011	}	1206	}
1012		1207
1013	sub invoke_size_allocate {	1208	sub invoke_size_allocate {
1014	my ($self, $w, $h) = @_;	1209	my ($self, $w, $h) = @_;
1015		1210
1016	$self->update_slider;	1211	$self->update_slider;
1017
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1212	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1213	}
1020		1214
1021	#############################################################################	1215	#############################################################################
1022		1216
1023	package CFClient::UI::Frame;	1217	package CFPlus::UI::Frame;
1024		1218
1025	our @ISA = CFClient::UI::Bin::;	1219	our @ISA = CFPlus::UI::Bin::;
1026		1220
1027	use CFClient::OpenGL;	1221	use CFPlus::OpenGL;
1028		1222
1029	sub new {	1223	sub new {
1030	my $class = shift;	1224	my $class = shift;
1031		1225
1032	$class->SUPER::new (	1226	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1252	$self->SUPER::_draw;
1059	}	1253	}
1060		1254
1061	#############################################################################	1255	#############################################################################
1062		1256
1063	package CFClient::UI::FancyFrame;	1257	package CFPlus::UI::FancyFrame;
1064		1258
1065	our @ISA = CFClient::UI::Bin::;	1259	our @ISA = CFPlus::UI::Bin::;
1066		1260
1067	use CFClient::OpenGL;	1261	use CFPlus::OpenGL;
		1262
		1263	sub new {
		1264	my ($class, %arg) = @_;
		1265
		1266	if ((exists $arg{label}) && !ref $arg{label}) {
		1267	$arg{label} = new CFPlus::UI::Label
		1268	align => 1,
		1269	valign => 0,
		1270	text => $arg{label},
		1271	fontsize => ($arg{border} || 0.8) * 0.75;
		1272	}
		1273
		1274	my $self = $class->SUPER::new (
		1275	# label => "",
		1276	fg => [0.6, 0.3, 0.1],
		1277	border => 0.8,
		1278	style => 'single',
		1279	%arg,
		1280	);
		1281
		1282	$self
		1283	}
		1284
		1285	sub add {
		1286	my ($self, @widgets) = @_;
		1287
		1288	$self->SUPER::add (@widgets);
		1289	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1290	}
		1291
		1292	sub border {
		1293	int $_[0]{border} * $::FONTSIZE
		1294	}
		1295
		1296	sub size_request {
		1297	my ($self) = @_;
		1298
		1299	($self->{label_w}, undef) = $self->{label}->size_request
		1300	if $self->{label};
		1301
		1302	my ($w, $h) = $self->SUPER::size_request;
		1303
		1304	(
		1305	$w + $self->border * 2,
		1306	$h + $self->border * 2,
		1307	)
		1308	}
		1309
		1310	sub invoke_size_allocate {
		1311	my ($self, $w, $h) = @_;
		1312
		1313	my $border = $self->border;
		1314
		1315	$w -= List::Util::max 0, $border * 2;
		1316	$h -= List::Util::max 0, $border * 2;
		1317
		1318	if (my $label = $self->{label}) {
		1319	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1320	$label->{h} = List::Util::min $h, $border;
		1321	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1322	}
		1323
		1324	$self->child->configure ($border, $border, $w, $h);
		1325
		1326	1
		1327	}
		1328
		1329	sub _draw {
		1330	my ($self) = @_;
		1331
		1332	my $child = $self->{children}[0];
		1333
		1334	my $border = $self->border;
		1335	my ($w, $h) = ($self->{w}, $self->{h});
		1336
		1337	$child->draw;
		1338
		1339	glColor @{$self->{fg}};
		1340	glBegin GL_LINE_STRIP;
		1341	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1342	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1343	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1344	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1345	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1346	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1347	glEnd;
		1348
		1349	if ($self->{label}) {
		1350	glTranslate $border * 2, 0;
		1351	$self->{label}->_draw;
		1352	}
		1353	}
		1354
		1355	#############################################################################
		1356
		1357	package CFPlus::UI::Toplevel;
		1358
		1359	our @ISA = CFPlus::UI::Bin::;
		1360
		1361	use CFPlus::OpenGL;
1068		1362
1069	my $bg =	1363	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1364	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1365	mipmap => 1, wrap => 1;
1072		1366
1073	my @border =	1367	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1368	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1369	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1370
		1371	my @icon =
		1372	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1373	qw(x1_move.png x1_resize.png);
1076		1374
1077	sub new {	1375	sub new {
1078	my ($class, %arg) = @_;	1376	my ($class, %arg) = @_;
1079		1377
1080	my $self = $class->SUPER::new (	1378	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1379	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1380	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1381	border => 0.6,
1084	can_events => 1,	1382	can_events => 1,
1085	min_w => 16,	1383	min_w => 64,
1086	min_h => 16,	1384	min_h => 32,
1087	%arg,	1385	%arg,
1088	);	1386	);
1089		1387
1090	$self->{title_widget} = new CFClient::UI::Label	1388	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1389	align => 0,
1092	valign => 1,	1390	valign => 1,
1093	text => $self->{title},	1391	text => $self->{title},
1094	fontsize => $self->{border},	1392	fontsize => $self->{border},
1095	if exists $self->{title};	1393	if exists $self->{title};
1096		1394
1097	if ($self->{has_close_button}) {	1395	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1396	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1397	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1398	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1399	on_activate => sub { $self->emit ("delete") };
1102		1400
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1401	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1402	}
1105		1403
1106	$self	1404	$self
1107	}	1405	}
1108		1406
1109	sub add {	1407	sub add {
1110	my ($self, @widgets) = @_;	1408	my ($self, @widgets) = @_;
1111		1409
1112	$self->SUPER::add (@widgets);	1410	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1411	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1412	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1413	}
1116		1414
1117	sub border {	1415	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1416	int $_[0]{border} * $::FONTSIZE
1119	}	1417	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1450	$self->child->configure ($border, $border, $w, $h);
1153		1451
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1452	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1453	if $self->{close_button};
1156		1454
		1455	1
		1456	}
		1457
		1458	sub invoke_delete {
		1459	my ($self) = @_;
		1460
		1461	$self->hide;
		1462
1157	1	1463	1
1158	}	1464	}
1159		1465
1160	sub invoke_button_down {	1466	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1467	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1525	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1526
1221	! ! $self->{motion}	1527	! ! $self->{motion}
1222	}	1528	}
1223		1529
		1530	sub invoke_visibility_change {
		1531	my ($self, $visible) = @_;
		1532
		1533	delete $self->{motion} unless $visible;
		1534
		1535	0
		1536	}
		1537
1224	sub _draw {	1538	sub _draw {
1225	my ($self) = @_;	1539	my ($self) = @_;
1226		1540
1227	my $child = $self->{children}[0];	1541	my $child = $self->{children}[0];
1228		1542
…		…
1233	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1547	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234		1548
1235	my $border = $self->border;	1549	my $border = $self->border;
1236		1550
1237	glColor @{ $self->{border_bg} };	1551	glColor @{ $self->{border_bg} };
1238	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1552	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1553	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1554	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1555	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1556
		1557	# move
		1558	my $w2 = ($w - $border) * .5;
		1559	my $h2 = ($h - $border) * .5;
		1560	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1561	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1562	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1563
		1564	# resize
		1565	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1566	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1567	unless $self->{has_close_button};
		1568	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1569	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1242		1570
1243	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1571	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244	glColor @{ $self->{bg} };	1572	glColor @{ $self->{bg} };
1245		1573
1246	# TODO: repeat texture not scale	1574	# TODO: repeat texture not scale
…		…
1265	if $self->{close_button};	1593	if $self->{close_button};
1266	}	1594	}
1267		1595
1268	#############################################################################	1596	#############################################################################
1269		1597
1270	package CFClient::UI::Table;	1598	package CFPlus::UI::Table;
1271		1599
1272	our @ISA = CFClient::UI::Base::;	1600	our @ISA = CFPlus::UI::Container::;
1273		1601
1274	use List::Util qw(max sum);	1602	use List::Util qw(max sum);
1275		1603
1276	use CFClient::OpenGL;	1604	use CFPlus::OpenGL;
1277		1605
1278	sub new {	1606	sub new {
1279	my $class = shift;	1607	my $class = shift;
1280		1608
1281	$class->SUPER::new (	1609	$class->SUPER::new (
1282	col_expand => [],	1610	col_expand => [],
		1611	row_expand => [],
1283	@_,	1612	@_,
1284	)	1613	)
1285	}	1614	}
1286		1615
1287	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}
1290
1291	sub add {	1616	sub add {
1292	my ($self, $x, $y, $child) = @_;	1617	my ($self, @widgets) = @_;
1293		1618
1294	$child->set_parent ($self);	1619	for my $child (@widgets) {
1295	$self->{children}[$y][$x] = $child;	1620	$child->{rowspan} ||= 1;
		1621	$child->{colspan} ||= 1;
		1622	}
1296		1623
1297	$self->realloc;	1624	$self->SUPER::add (@widgets);
1298	}	1625	}
1299		1626
1300	sub remove {	1627	sub add_at {
		1628	my $self = shift;
		1629
		1630	my @widgets;
		1631
		1632	while (@_) {
		1633	my ($col, $row, $child) = splice @_, 0, 3, ();
		1634
		1635	$child->{row} = $row;
		1636	$child->{col} = $col;
		1637
		1638	push @widgets, $child;
		1639	}
		1640
		1641	$self->add (@widgets);
		1642	}
		1643
		1644	sub get_wh {
1301	my ($self, $child) = @_;	1645	my ($self) = @_;
1302		1646
1303	# TODO: not yet implemented	1647	my (@w, @h);
1304	}
1305
1306	# TODO: move to container class maybe? send children a signal on removal?
1307	sub clear {
1308	my ($self) = @_;
1309		1648
1310	my @children = $self->children;	1649	my @children = $self->children;
1311	delete $self->{children};	1650
		1651	# first pass, columns
		1652	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1653	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1654
		1655	my $sw = sum @w[$c .. $c + $cs - 1];
		1656
		1657	if ($w > $sw) {
		1658	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1659	}
1312		1660	}
1313	for (@children) {
1314	delete $_->{parent};
1315	$_->hide;
1316	}
1317		1661
1318	$self->realloc;	1662	# second pass, rows
1319	}	1663	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1320
1321	sub get_wh {
1322	my ($self) = @_;
1323
1324	my (@w, @h);
1325
1326	for my $y (0 .. $#{$self->{children}}) {
1327	my $row = $self->{children}[$y]
1328	or next;
1329
1330	for my $x (0 .. $#$row) {
1331	my $widget = $row->[$x]
1332	or next;
1333	my ($w, $h) = @$widget{qw(req_w req_h)};	1664	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1334		1665
1335	$w[$x] = max $w[$x], $w;	1666	my $sh = sum @h[$r .. $r + $rs - 1];
1336	$h[$y] = max $h[$y], $h;	1667
		1668	if ($h > $sh) {
		1669	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1337	}	1670	}
1338	}	1671	}
1339		1672
1340	(\@w, \@h)	1673	(\@w, \@h)
1341	}	1674	}
…		…
1357	my ($ws, $hs) = $self->get_wh;	1690	my ($ws, $hs) = $self->get_wh;
1358		1691
1359	my $req_w = (sum @$ws) || 1;	1692	my $req_w = (sum @$ws) || 1;
1360	my $req_h = (sum @$hs) || 1;	1693	my $req_h = (sum @$hs) || 1;
1361		1694
1362	# TODO: nicer code && do row_expand	1695	# now linearly scale the rows/columns to the allocated size
1363	my @col_expand = @{$self->{col_expand}};	1696	my @col_expand = @{$self->{col_expand}};
1364	@col_expand = (1) x @$ws unless @col_expand;	1697	@col_expand = (1) x @$ws unless @col_expand;
1365	my $col_expand = (sum @col_expand) || 1;	1698	my $col_expand = (sum @col_expand) || 1;
1366		1699
1367	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1700	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1701
1371	CFClient::UI::harmonize $ws;	1702	CFPlus::UI::harmonize $ws;
		1703
		1704	my @row_expand = @{$self->{row_expand}};
		1705	@row_expand = (1) x @$ws unless @row_expand;
		1706	my $row_expand = (sum @row_expand) || 1;
		1707
		1708	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1709
1372	CFClient::UI::harmonize $hs;	1710	CFPlus::UI::harmonize $hs;
1373		1711
1374	my $y;	1712	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1713	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1375		1714
1376	for my $r (0 .. $#{$self->{children}}) {	1715	for my $widget ($self->children) {
1377	my $row = $self->{children}[$r]	1716	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1378	or next;
1379		1717
1380	my $x = 0;	1718	$widget->configure (
1381	my $row_h = $hs->[$r];	1719	$x[$c], $y[$r],
		1720	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1382		1721	);
1383	for my $c (0 .. $#$row) {	1722	}
1384	my $col_w = $ws->[$c];
1385		1723
1386	if (my $widget = $row->[$c]) {	1724	1
1387	$widget->configure ($x, $y, $col_w, $row_h);	1725	}
1388	}
1389		1726
1390	$x += $col_w;	1727	#############################################################################
		1728
		1729	package CFPlus::UI::Fixed;
		1730
		1731	use List::Util qw(min max);
		1732
		1733	our @ISA = CFPlus::UI::Container::;
		1734
		1735	sub add_fixed {
		1736	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1737
		1738	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1739	$self->SUPER::add ($child);
		1740	}
		1741
		1742	sub _scale($$$) {
		1743	my ($mode, $val, $max) = @_;
		1744
		1745	$mode eq "abs" ? $val
		1746	: $mode eq "rel" ? $val * $max
		1747	: 0
		1748	}
		1749
		1750	sub size_request {
		1751	my ($self) = @_;
		1752
		1753	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1754
		1755	# determine overall size by querying abs widgets
		1756	for my $child ($self->visible_children) {
		1757	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1758
		1759	if ($pos eq "abs") {
		1760	$w = _scale $size, $w, $child->{req_w};
		1761	$h = _scale $size, $h, $child->{req_h};
		1762
		1763	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1764	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1391	}	1765	}
		1766	}
1392		1767
1393	$y += $row_h;	1768	my $W = $x2 - $x1;
		1769	my $H = $y2 - $y1;
		1770
		1771	# now layout remaining widgets
		1772	for my $child ($self->visible_children) {
		1773	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1774
		1775	if ($pos ne "abs") {
		1776	$x = _scale $pos, $x, $W;
		1777	$y = _scale $pos, $x, $H;
		1778	$w = _scale $size, $w, $child->{req_w};
		1779	$h = _scale $size, $h, $child->{req_h};
		1780
		1781	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1782	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1783	}
		1784	}
		1785
		1786	my $W = $x2 - $x1;
		1787	my $H = $y2 - $y1;
		1788
		1789	($W, $H)
		1790	}
		1791
		1792	sub invoke_size_allocate {
		1793	my ($self, $W, $H) = @_;
		1794
		1795	for my $child ($self->visible_children) {
		1796	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1797
		1798	$x = _scale $pos, $x, $W;
		1799	$y = _scale $pos, $x, $H;
		1800	$w = _scale $size, $w, $W;
		1801	$h = _scale $size, $h, $H;
		1802
		1803	$child->configure ($x, $y, $w, $h);
1394	}	1804	}
1395		1805
1396	1	1806	1
1397	}	1807	}
1398		1808
1399	sub find_widget {
1400	my ($self, $x, $y) = @_;
1401
1402	$x -= $self->{x};
1403	$y -= $self->{y};
1404
1405	my $res;
1406
1407	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1408	$res = $_->find_widget ($x, $y)
1409	and return $res;
1410	}
1411
1412	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1413	}
1414
1415	sub _draw {
1416	my ($self) = @_;
1417
1418	for (grep $_, @{$self->{children}}) {
1419	$_->draw for grep $_, @$_;
1420	}
1421	}
1422
1423	#############################################################################	1809	#############################################################################
1424		1810
1425	package CFClient::UI::Box;	1811	package CFPlus::UI::Box;
1426		1812
1427	our @ISA = CFClient::UI::Container::;	1813	our @ISA = CFPlus::UI::Container::;
1428		1814
1429	sub size_request {	1815	sub size_request {
1430	my ($self) = @_;	1816	my ($self) = @_;
1431		1817
1432	$self->{vertical}	1818	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1851	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1852	for 0 .. $#children;
1467	}	1853	}
1468	}	1854	}
1469		1855
1470	CFClient::UI::harmonize \@req;	1856	CFPlus::UI::harmonize \@req;
1471		1857
1472	my $pos = 0;	1858	my $pos = 0;
1473	for (0 .. $#children) {	1859	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1860	my $alloc = $req[$_];
1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1861	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1480	1	1866	1
1481	}	1867	}
1482		1868
1483	#############################################################################	1869	#############################################################################
1484		1870
1485	package CFClient::UI::HBox;	1871	package CFPlus::UI::HBox;
1486		1872
1487	our @ISA = CFClient::UI::Box::;	1873	our @ISA = CFPlus::UI::Box::;
1488		1874
1489	sub new {	1875	sub new {
1490	my $class = shift;	1876	my $class = shift;
1491		1877
1492	$class->SUPER::new (	1878	$class->SUPER::new (
…		…
1495	)	1881	)
1496	}	1882	}
1497		1883
1498	#############################################################################	1884	#############################################################################
1499		1885
1500	package CFClient::UI::VBox;	1886	package CFPlus::UI::VBox;
1501		1887
1502	our @ISA = CFClient::UI::Box::;	1888	our @ISA = CFPlus::UI::Box::;
1503		1889
1504	sub new {	1890	sub new {
1505	my $class = shift;	1891	my $class = shift;
1506		1892
1507	$class->SUPER::new (	1893	$class->SUPER::new (
…		…
1510	)	1896	)
1511	}	1897	}
1512		1898
1513	#############################################################################	1899	#############################################################################
1514		1900
1515	package CFClient::UI::Label;	1901	package CFPlus::UI::Label;
1516		1902
1517	our @ISA = CFClient::UI::DrawBG::;	1903	our @ISA = CFPlus::UI::DrawBG::;
1518		1904
1519	use CFClient::OpenGL;	1905	use CFPlus::OpenGL;
1520		1906
1521	sub new {	1907	sub new {
1522	my ($class, %arg) = @_;	1908	my ($class, %arg) = @_;
1523		1909
1524	my $self = $class->SUPER::new (	1910	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1913	#active_bg => none
1528	#font => default_font	1914	#font => default_font
1529	#text => initial text	1915	#text => initial text
1530	#markup => initial narkup	1916	#markup => initial narkup
1531	#max_w => maximum pixel width	1917	#max_w => maximum pixel width
		1918	#style => 0, # render flags
1532	ellipsise => 3, # end	1919	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1920	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1921	fontsize => 1,
1535	align => -1,	1922	align => -1,
1536	valign => -1,	1923	valign => -1,
1537	padding_x => 2,	1924	padding_x => 2,
1538	padding_y => 2,	1925	padding_y => 2,
1539	can_events => 0,	1926	can_events => 0,
1540	%arg	1927	%arg
1541	);	1928	);
1542		1929
1543	if (exists $self->{template}) {	1930	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1931	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1932	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1933	$self->{template} = $layout;
1547	}	1934	}
1548		1935
1549	if (exists $self->{markup}) {	1936	if (exists $self->{markup}) {
…		…
1553	}	1940	}
1554		1941
1555	$self	1942	$self
1556	}	1943	}
1557		1944
1558	sub escape($) {
1559	local $_ = $_[0];
1560
1561	s/&/&amp;/g;
1562	s/>/&gt;/g;
1563	s/</&lt;/g;
1564
1565	$_
1566	}
1567
1568	sub update {	1945	sub update {
1569	my ($self) = @_;	1946	my ($self) = @_;
1570		1947
1571	delete $self->{texture};	1948	delete $self->{texture};
1572	$self->SUPER::update;	1949	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1960	my ($self, $text) = @_;
1584		1961
1585	return if $self->{text} eq "T$text";	1962	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1963	$self->{text} = "T$text";
1587		1964
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1965	$self->{layout}->set_text ($text);
1590		1966
1591	delete $self->{size_req};	1967	delete $self->{size_req};
1592	$self->realloc;	1968	$self->realloc;
1593	$self->update;	1969	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1975	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1976	$self->{text} = "M$markup";
1601		1977
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1978	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1979
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1980	$self->{layout}->set_markup ($markup);
1606		1981
1607	delete $self->{size_req};	1982	delete $self->{size_req};
1608	$self->realloc;	1983	$self->realloc;
1609	$self->update;	1984	$self->update;
…		…
1621		1996
1622	my ($w, $h) = $self->{layout}->size;	1997	my ($w, $h) = $self->{layout}->size;
1623		1998
1624	if (exists $self->{template}) {	1999	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	2000	$self->{template}->set_font ($self->{font}) if $self->{font};
		2001	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2002	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		2003
1628	my ($w2, $h2) = $self->{template}->size;	2004	my ($w2, $h2) = $self->{template}->size;
1629		2005
1630	$w = List::Util::max $w, $w2;	2006	$w = List::Util::max $w, $w2;
…		…
1664		2040
1665	sub reconfigure {	2041	sub reconfigure {
1666	my ($self) = @_;	2042	my ($self) = @_;
1667		2043
1668	delete $self->{size_req};	2044	delete $self->{size_req};
		2045	delete $self->{texture};
1669		2046
1670	$self->SUPER::reconfigure;	2047	$self->SUPER::reconfigure;
1671	}	2048	}
1672		2049
1673	sub _draw {	2050	sub _draw {
1674	my ($self) = @_;	2051	my ($self) = @_;
1675		2052
1676	$self->SUPER::_draw; # draw background, if applicable	2053	$self->SUPER::_draw; # draw background, if applicable
1677		2054
1678	my $tex = $self->{texture} ||= do {	2055	my $size = $self->{texture} ||= do {
1679	$self->{layout}->set_foreground (@{$self->{fg}});	2056	$self->{layout}->set_foreground (@{$self->{fg}});
1680	$self->{layout}->set_font ($self->{font}) if $self->{font};	2057	$self->{layout}->set_font ($self->{font}) if $self->{font};
1681	$self->{layout}->set_width ($self->{w});	2058	$self->{layout}->set_width ($self->{w});
1682	$self->{layout}->set_ellipsise ($self->{ellipsise});	2059	$self->{layout}->set_ellipsise ($self->{ellipsise});
1683	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2060	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1684	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2061	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1685		2062
1686	new_from_layout CFClient::Texture $self->{layout}	2063	[$self->{layout}->size]
1687	};	2064	};
1688		2065
1689	unless (exists $self->{ox}) {	2066	unless (exists $self->{ox}) {
1690	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2067	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1691	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2068	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1692	: ($self->{w} - $tex->{w}) * 0.5);	2069	: ($self->{w} - $size->[0]) * 0.5);
1693		2070
1694	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2071	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1695	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2072	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1696	: ($self->{h} - $tex->{h}) * 0.5);	2073	: ($self->{h} - $size->[1]) * 0.5);
1697	};	2074	};
1698		2075
1699	glEnable GL_TEXTURE_2D;
1700
1701	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2076	my $w = List::Util::min $self->{w} + 4, $size->[0];
1702	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2077	my $h = List::Util::min $self->{h} + 2, $size->[1];
1703		2078
1704	if ($tex->{format} == GL_ALPHA) {	2079	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706	glColor @{$self->{fg}};
1707	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708	} else {
1709	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1710	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711	}
1712
1713	glDisable GL_TEXTURE_2D;
1714	}	2080	}
1715		2081
1716	#############################################################################	2082	#############################################################################
1717		2083
1718	package CFClient::UI::EntryBase;	2084	package CFPlus::UI::EntryBase;
1719		2085
1720	our @ISA = CFClient::UI::Label::;	2086	our @ISA = CFPlus::UI::Label::;
1721		2087
1722	use CFClient::OpenGL;	2088	use CFPlus::OpenGL;
1723		2089
1724	sub new {	2090	sub new {
1725	my $class = shift;	2091	my $class = shift;
1726		2092
1727	$class->SUPER::new (	2093	$class->SUPER::new (
…		…
1731	active_fg => [0, 0, 0],	2097	active_fg => [0, 0, 0],
1732	can_hover => 1,	2098	can_hover => 1,
1733	can_focus => 1,	2099	can_focus => 1,
1734	valign => 0,	2100	valign => 0,
1735	can_events => 1,	2101	can_events => 1,
		2102	ellipsise => 0,
1736	#text => ...	2103	#text => ...
1737	#hidden => "*",	2104	#hidden => "*",
1738	@_	2105	@_
1739	)	2106	)
1740	}	2107	}
…		…
1785	my $sym = $ev->{sym};	2152	my $sym = $ev->{sym};
1786	my $uni = $ev->{unicode};	2153	my $uni = $ev->{unicode};
1787		2154
1788	my $text = $self->get_text;	2155	my $text = $self->get_text;
1789		2156
		2157	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2158
1790	if ($uni == 8) {	2159	if ($uni == 8) {
1791	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2160	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1792	} elsif ($uni == 127) {	2161	} elsif ($uni == 127) {
1793	substr $text, $self->{cursor}, 1, "";	2162	substr $text, $self->{cursor}, 1, "";
1794	} elsif ($sym == CFClient::SDLK_LEFT) {	2163	} elsif ($sym == CFPlus::SDLK_LEFT) {
1795	--$self->{cursor} if $self->{cursor};	2164	--$self->{cursor} if $self->{cursor};
1796	} elsif ($sym == CFClient::SDLK_RIGHT) {	2165	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1797	++$self->{cursor} if $self->{cursor} < length $self->{text};	2166	++$self->{cursor} if $self->{cursor} < length $self->{text};
1798	} elsif ($sym == CFClient::SDLK_HOME) {	2167	} elsif ($sym == CFPlus::SDLK_HOME) {
		2168	# what a hack
		2169	$self->{cursor} =
		2170	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2171	? length $1
		2172	: 0;
		2173	} elsif ($sym == CFPlus::SDLK_END) {
		2174	# uh, again
		2175	$self->{cursor} =
		2176	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2177	? $self->{cursor} + length $1
		2178	: length $self->{text};
		2179	} elsif ($uni == 21) { # ctrl-u
		2180	$text = "";
1799	$self->{cursor} = 0;	2181	$self->{cursor} = 0;
1800	} elsif ($sym == CFClient::SDLK_END) {
1801	$self->{cursor} = length $text;
1802	} elsif ($uni == 27) {	2182	} elsif ($uni == 27) {
1803	$self->emit ('escape');	2183	$self->emit ('escape');
1804	} elsif ($uni) {	2184	} elsif ($uni == 0x0d) {
		2185	substr $text, $self->{cursor}++, 0, "\012";
		2186	} elsif ($uni >= 0x20) {
1805	substr $text, $self->{cursor}++, 0, chr $uni;	2187	substr $text, $self->{cursor}++, 0, chr $uni;
1806	} else {	2188	} else {
1807	return 0;	2189	return 0;
1808	}	2190	}
1809		2191
1810	$self->_set_text ($text);	2192	$self->_set_text ($text);
1811		2193
1812	$self->realloc;	2194	$self->realloc;
		2195	$self->update;
1813		2196
1814	1	2197	1
1815	}	2198	}
1816		2199
1817	sub invoke_focus_in {	2200	sub invoke_focus_in {
…		…
1829		2212
1830	my $idx = $self->{layout}->xy_to_index ($x, $y);	2213	my $idx = $self->{layout}->xy_to_index ($x, $y);
1831		2214
1832	# byte-index to char-index	2215	# byte-index to char-index
1833	my $text = $self->{text};	2216	my $text = $self->{text};
1834	utf8::encode $text;	2217	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1835	$self->{cursor} = length substr $text, 0, $idx;	2218	$self->{cursor} = length $text;
1836		2219
1837	$self->_set_text ($self->{text});	2220	$self->_set_text ($self->{text});
1838	$self->update;	2221	$self->update;
1839		2222
1840	1	2223	1
…		…
1879	utf8::encode $text;	2262	utf8::encode $text;
1880		2263
1881	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2264	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1882	}	2265	}
1883		2266
1884	glColor @{$self->{fg}};
1885	glBegin GL_LINES;	2267	glBegin GL_LINES;
1886	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2268	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1887	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2269	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1888	glEnd;	2270	glEnd;
1889	}	2271	}
1890	}	2272	}
1891		2273
		2274	#############################################################################
		2275
1892	package CFClient::UI::Entry;	2276	package CFPlus::UI::Entry;
1893		2277
1894	our @ISA = CFClient::UI::EntryBase::;	2278	our @ISA = CFPlus::UI::EntryBase::;
1895		2279
1896	use CFClient::OpenGL;	2280	use CFPlus::OpenGL;
1897		2281
1898	sub invoke_key_down {	2282	sub invoke_key_down {
1899	my ($self, $ev) = @_;	2283	my ($self, $ev) = @_;
1900		2284
1901	my $sym = $ev->{sym};	2285	my $sym = $ev->{sym};
1902		2286
1903	if ($sym == 13) {	2287	if ($ev->{uni} == 0x0d || $sym == 13) {
1904	unshift @{$self->{history}},	2288	unshift @{$self->{history}},
1905	my $txt = $self->get_text;	2289	my $txt = $self->get_text;
1906		2290
1907	$self->{history_pointer} = -1;	2291	$self->{history_pointer} = -1;
1908	$self->{history_saveback} = '';	2292	$self->{history_saveback} = '';
1909	$self->emit (activate => $txt);	2293	$self->emit (activate => $txt);
1910	$self->update;	2294	$self->update;
1911		2295
1912	} elsif ($sym == CFClient::SDLK_UP) {	2296	} elsif ($sym == CFPlus::SDLK_UP) {
1913	if ($self->{history_pointer} < 0) {	2297	if ($self->{history_pointer} < 0) {
1914	$self->{history_saveback} = $self->get_text;	2298	$self->{history_saveback} = $self->get_text;
1915	}	2299	}
1916	if (@{$self->{history} || []} > 0) {	2300	if (@{$self->{history} || []} > 0) {
1917	$self->{history_pointer}++;	2301	$self->{history_pointer}++;
…		…
1919	$self->{history_pointer} = @{$self->{history} || []} - 1;	2303	$self->{history_pointer} = @{$self->{history} || []} - 1;
1920	}	2304	}
1921	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2305	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1922	}	2306	}
1923		2307
1924	} elsif ($sym == CFClient::SDLK_DOWN) {	2308	} elsif ($sym == CFPlus::SDLK_DOWN) {
1925	$self->{history_pointer}--;	2309	$self->{history_pointer}--;
1926	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2310	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1927		2311
1928	if ($self->{history_pointer} >= 0) {	2312	if ($self->{history_pointer} >= 0) {
1929	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2313	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1938	1	2322	1
1939	}	2323	}
1940		2324
1941	#############################################################################	2325	#############################################################################
1942		2326
		2327	package CFPlus::UI::TextEdit;
		2328
		2329	our @ISA = CFPlus::UI::EntryBase::;
		2330
		2331	use CFPlus::OpenGL;
		2332
		2333	sub move_cursor_ver {
		2334	my ($self, $dy) = @_;
		2335
		2336	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2337
		2338	$y += $dy;
		2339
		2340	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2341	$self->{cursor} = $index;
		2342	delete $self->{cur_h};
		2343	$self->update;
		2344	return;
		2345	}
		2346	}
		2347
		2348	sub invoke_key_down {
		2349	my ($self, $ev) = @_;
		2350
		2351	my $sym = $ev->{sym};
		2352
		2353	if ($sym == CFPlus::SDLK_UP) {
		2354	$self->move_cursor_ver (-1);
		2355	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2356	$self->move_cursor_ver (+1);
		2357	} else {
		2358	return $self->SUPER::invoke_key_down ($ev)
		2359	}
		2360
		2361	1
		2362	}
		2363
		2364	#############################################################################
		2365
1943	package CFClient::UI::Button;	2366	package CFPlus::UI::Button;
1944		2367
1945	our @ISA = CFClient::UI::Label::;	2368	our @ISA = CFPlus::UI::Label::;
1946		2369
1947	use CFClient::OpenGL;	2370	use CFPlus::OpenGL;
1948		2371
1949	my @tex =	2372	my @tex =
1950	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2373	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1951	qw(b1_button_active.png);	2374	qw(b1_button_inactive.png b1_button_active.png);
1952		2375
1953	sub new {	2376	sub new {
1954	my $class = shift;	2377	my $class = shift;
1955		2378
1956	$class->SUPER::new (	2379	$class->SUPER::new (
1957	padding_x => 4,	2380	padding_x => 4,
1958	padding_y => 4,	2381	padding_y => 4,
1959	fg => [1, 1, 1],	2382	fg => [1.0, 1.0, 1.0],
1960	active_fg => [0, 0, 1],	2383	active_fg => [0.8, 0.8, 0.8],
1961	can_hover => 1,	2384	can_hover => 1,
1962	align => 0,	2385	align => 0,
1963	valign => 0,	2386	valign => 0,
1964	can_events => 1,	2387	can_events => 1,
1965	@_	2388	@_
…		…
1983		2406
1984	glEnable GL_TEXTURE_2D;	2407	glEnable GL_TEXTURE_2D;
1985	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986	glColor 0, 0, 0, 1;	2409	glColor 0, 0, 0, 1;
1987		2410
		2411	my $tex = $tex[$GRAB == $self];
1988	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2412	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1989		2413
1990	glDisable GL_TEXTURE_2D;	2414	glDisable GL_TEXTURE_2D;
1991		2415
1992	$self->SUPER::_draw;	2416	$self->SUPER::_draw;
1993	}	2417	}
1994		2418
1995	#############################################################################	2419	#############################################################################
1996		2420
		2421	package CFPlus::UI::CheckBox;
		2422
		2423	our @ISA = CFPlus::UI::DrawBG::;
		2424
		2425	my @tex =
		2426	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2427	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2428
		2429	use CFPlus::OpenGL;
		2430
		2431	sub new {
		2432	my $class = shift;
		2433
		2434	$class->SUPER::new (
		2435	padding_x => 2,
		2436	padding_y => 2,
		2437	fg => [1, 1, 1],
		2438	active_fg => [1, 1, 0],
		2439	bg => [0, 0, 0, 0.2],
		2440	active_bg => [1, 1, 1, 0.5],
		2441	state => 0,
		2442	can_hover => 1,
		2443	@_
		2444	)
		2445	}
		2446
		2447	sub size_request {
		2448	my ($self) = @_;
		2449
		2450	(6) x 2
		2451	}
		2452
		2453	sub toggle {
		2454	my ($self) = @_;
		2455
		2456	$self->{state} = !$self->{state};
		2457	$self->emit (changed => $self->{state});
		2458	$self->update;
		2459	}
		2460
		2461	sub invoke_button_down {
		2462	my ($self, $ev, $x, $y) = @_;
		2463
		2464	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2465	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2466	$self->toggle;
		2467	} else {
		2468	return 0
		2469	}
		2470
		2471	1
		2472	}
		2473
		2474	sub _draw {
		2475	my ($self) = @_;
		2476
		2477	$self->SUPER::_draw;
		2478
		2479	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2480
		2481	my ($w, $h) = @$self{qw(w h)};
		2482
		2483	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2484
		2485	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2486
		2487	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2488
		2489	glEnable GL_TEXTURE_2D;
		2490	$tex->draw_quad_alpha (0, 0, $s, $s);
		2491	glDisable GL_TEXTURE_2D;
		2492	}
		2493
		2494	#############################################################################
		2495
		2496	package CFPlus::UI::Image;
		2497
		2498	our @ISA = CFPlus::UI::Base::;
		2499
		2500	use CFPlus::OpenGL;
		2501
		2502	our %texture_cache;
		2503
		2504	sub new {
		2505	my $class = shift;
		2506
		2507	my $self = $class->SUPER::new (
		2508	can_events => 0,
		2509	@_,
		2510	);
		2511
		2512	$self->{path} || $self->{tex}
		2513	or Carp::croak "'path' or 'tex' attributes required";
		2514
		2515	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2516	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2517
		2518	CFPlus::weaken $texture_cache{$self->{path}};
		2519
		2520	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2521
		2522	$self
		2523	}
		2524
		2525	sub STORABLE_freeze {
		2526	my ($self, $cloning) = @_;
		2527
		2528	$self->{path}
		2529	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2530
		2531	$self->{path}
		2532	}
		2533
		2534	sub STORABLE_attach {
		2535	my ($self, $cloning, $path) = @_;
		2536
		2537	$self->new (path => $path)
		2538	}
		2539
		2540	sub size_request {
		2541	my ($self) = @_;
		2542
		2543	($self->{tex}{w}, $self->{tex}{h})
		2544	}
		2545
		2546	sub _draw {
		2547	my ($self) = @_;
		2548
		2549	my $tex = $self->{tex};
		2550
		2551	my ($w, $h) = ($self->{w}, $self->{h});
		2552
		2553	if ($self->{rot90}) {
		2554	glRotate 90, 0, 0, 1;
		2555	glTranslate 0, -$self->{w}, 0;
		2556
		2557	($w, $h) = ($h, $w);
		2558	}
		2559
		2560	glEnable GL_TEXTURE_2D;
		2561	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2562
		2563	$tex->draw_quad (0, 0, $w, $h);
		2564
		2565	glDisable GL_TEXTURE_2D;
		2566	}
		2567
		2568	#############################################################################
		2569
1997	package CFClient::UI::ImageButton;	2570	package CFPlus::UI::ImageButton;
1998		2571
1999	our @ISA = CFClient::UI::Image::;	2572	our @ISA = CFPlus::UI::Image::;
2000		2573
2001	use CFClient::OpenGL;	2574	use CFPlus::OpenGL;
2002		2575
2003	my %textures;	2576	my %textures;
2004		2577
2005	sub new {	2578	sub new {
2006	my $class = shift;	2579	my $class = shift;
…		…
2028	1	2601	1
2029	}	2602	}
2030		2603
2031	#############################################################################	2604	#############################################################################
2032		2605
2033	package CFClient::UI::CheckBox;
2034
2035	our @ISA = CFClient::UI::DrawBG::;
2036
2037	my @tex =
2038	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2039	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2040
2041	use CFClient::OpenGL;
2042
2043	sub new {
2044	my $class = shift;
2045
2046	$class->SUPER::new (
2047	padding_x => 2,
2048	padding_y => 2,
2049	fg => [1, 1, 1],
2050	active_fg => [1, 1, 0],
2051	bg => [0, 0, 0, 0.2],
2052	active_bg => [1, 1, 1, 0.5],
2053	state => 0,
2054	can_hover => 1,
2055	@_
2056	)
2057	}
2058
2059	sub size_request {
2060	my ($self) = @_;
2061
2062	(6) x 2
2063	}
2064
2065	sub invoke_button_down {
2066	my ($self, $ev, $x, $y) = @_;
2067
2068	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2069	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2070	$self->{state} = !$self->{state};
2071	$self->emit (changed => $self->{state});
2072	} else {
2073	return 0
2074	}
2075
2076	1
2077	}
2078
2079	sub _draw {
2080	my ($self) = @_;
2081
2082	$self->SUPER::_draw;
2083
2084	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2085
2086	my ($w, $h) = @$self{qw(w h)};
2087
2088	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2089
2090	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2091
2092	my $tex = $self->{state} ? $tex[1] : $tex[0];
2093
2094	glEnable GL_TEXTURE_2D;
2095	$tex->draw_quad_alpha (0, 0, $s, $s);
2096	glDisable GL_TEXTURE_2D;
2097	}
2098
2099	#############################################################################
2100
2101	package CFClient::UI::Image;	2606	package CFPlus::UI::VGauge;
2102		2607
2103	our @ISA = CFClient::UI::Base::;	2608	our @ISA = CFPlus::UI::Base::;
2104
2105	use CFClient::OpenGL;
2106
2107	our %texture_cache;
2108
2109	sub new {
2110	my $class = shift;
2111
2112	my $self = $class->SUPER::new (
2113	can_events => 0,
2114	@_,
2115	);
2116
2117	$self->{path}
2118	or Carp::croak "required attribute 'path' not set";
2119
2120	$self->{tex} = $texture_cache{$self->{path}} ||=
2121	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2122
2123	Scalar::Util::weaken $texture_cache{$self->{path}};
2124
2125	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2126
2127	$self
2128	}
2129
2130	sub size_request {
2131	my ($self) = @_;
2132
2133	($self->{tex}{w}, $self->{tex}{h})
2134	}
2135
2136	sub _draw {
2137	my ($self) = @_;
2138
2139	my $tex = $self->{tex};
2140
2141	my ($w, $h) = ($self->{w}, $self->{h});
2142
2143	if ($self->{rot90}) {
2144	glRotate 90, 0, 0, 1;
2145	glTranslate 0, -$self->{w}, 0;
2146
2147	($w, $h) = ($h, $w);
2148	}
2149
2150	glEnable GL_TEXTURE_2D;
2151	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2152
2153	$tex->draw_quad_alpha (0, 0, $w, $h);
2154
2155	glDisable GL_TEXTURE_2D;
2156	}
2157
2158	#############################################################################
2159
2160	package CFClient::UI::VGauge;
2161
2162	our @ISA = CFClient::UI::Base::;
2163		2609
2164	use List::Util qw(min max);	2610	use List::Util qw(min max);
2165		2611
2166	use CFClient::OpenGL;	2612	use CFPlus::OpenGL;
2167		2613
2168	my %tex = (	2614	my %tex = (
2169	food => [	2615	food => [
2170	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2616	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2617	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2172	],	2618	],
2173	grace => [	2619	grace => [
2174	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2620	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2175	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2621	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2176	],	2622	],
2177	hp => [	2623	hp => [
2178	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2624	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2625	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2180	],	2626	],
2181	mana => [	2627	mana => [
2182	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2628	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2629	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2184	],	2630	],
2185	);	2631	);
2186		2632
2187	# eg. VGauge->new (gauge => 'food'), default gauge: food	2633	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2247	my $ycut1 = max 0, min 1, $ycut;	2693	my $ycut1 = max 0, min 1, $ycut;
2248	my $ycut2 = max 0, min 1, $ycut - 1;	2694	my $ycut2 = max 0, min 1, $ycut - 1;
2249		2695
2250	my $h1 = $self->{h} * (1 - $ycut1);	2696	my $h1 = $self->{h} * (1 - $ycut1);
2251	my $h2 = $self->{h} * (1 - $ycut2);	2697	my $h2 = $self->{h} * (1 - $ycut2);
		2698	my $h3 = $self->{h};
		2699
		2700	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2252		2701
2253	glEnable GL_BLEND;	2702	glEnable GL_BLEND;
2254	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2703	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2704	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2256	glEnable GL_TEXTURE_2D;	2705	glEnable GL_TEXTURE_2D;
…		…
2275		2724
2276	if ($t3) {	2725	if ($t3) {
2277	glBindTexture GL_TEXTURE_2D, $t3->{name};	2726	glBindTexture GL_TEXTURE_2D, $t3->{name};
2278	glBegin GL_QUADS;	2727	glBegin GL_QUADS;
2279	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2728	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2280	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2729	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2281	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2730	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2282	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2731	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2283	glEnd;	2732	glEnd;
2284	}	2733	}
2285		2734
2286	glDisable GL_BLEND;	2735	glDisable GL_BLEND;
2287	glDisable GL_TEXTURE_2D;	2736	glDisable GL_TEXTURE_2D;
2288	}	2737	}
2289		2738
2290	#############################################################################	2739	#############################################################################
2291		2740
2292	package CFClient::UI::Gauge;	2741	package CFPlus::UI::Gauge;
2293		2742
2294	our @ISA = CFClient::UI::VBox::;	2743	our @ISA = CFPlus::UI::VBox::;
2295		2744
2296	sub new {	2745	sub new {
2297	my ($class, %arg) = @_;	2746	my ($class, %arg) = @_;
2298		2747
2299	my $self = $class->SUPER::new (	2748	my $self = $class->SUPER::new (
…		…
2301	can_hover => 1,	2750	can_hover => 1,
2302	can_events => 1,	2751	can_events => 1,
2303	%arg,	2752	%arg,
2304	);	2753	);
2305		2754
2306	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2755	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2307	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2756	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2308	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2757	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2309		2758
2310	$self	2759	$self
2311	}	2760	}
2312		2761
2313	sub set_fontsize {	2762	sub set_fontsize {
…		…
2334	$self->{value}->set_text ($val);	2783	$self->{value}->set_text ($val);
2335	}	2784	}
2336		2785
2337	#############################################################################	2786	#############################################################################
2338		2787
2339	package CFClient::UI::Slider;	2788	package CFPlus::UI::Slider;
2340		2789
2341	use strict;	2790	use strict;
2342		2791
2343	use CFClient::OpenGL;	2792	use CFPlus::OpenGL;
2344		2793
2345	our @ISA = CFClient::UI::DrawBG::;	2794	our @ISA = CFPlus::UI::DrawBG::;
2346		2795
2347	my @tex =	2796	my @tex =
2348	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2797	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2349	qw(s1_slider.png s1_slider_bg.png);	2798	qw(s1_slider.png s1_slider_bg.png);
2350		2799
2351	sub new {	2800	sub new {
2352	my $class = shift;	2801	my $class = shift;
2353		2802
…		…
2442	}	2891	}
2443		2892
2444	1	2893	1
2445	}	2894	}
2446		2895
		2896	sub invoke_mouse_wheel {
		2897	my ($self, $ev) = @_;
		2898
		2899	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2900
		2901	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2902
		2903	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2904
		2905	! ! $delta
		2906	}
		2907
2447	sub update {	2908	sub update {
2448	my ($self) = @_;	2909	my ($self) = @_;
2449		2910
2450	delete $self->{knob_w};	2911	delete $self->{knob_w};
2451	$self->SUPER::update;	2912	$self->SUPER::update;
…		…
2498	glDisable GL_TEXTURE_2D;	2959	glDisable GL_TEXTURE_2D;
2499	}	2960	}
2500		2961
2501	#############################################################################	2962	#############################################################################
2502		2963
2503	package CFClient::UI::ValSlider;	2964	package CFPlus::UI::ValSlider;
2504		2965
2505	our @ISA = CFClient::UI::HBox::;	2966	our @ISA = CFPlus::UI::HBox::;
2506		2967
2507	sub new {	2968	sub new {
2508	my ($class, %arg) = @_;	2969	my ($class, %arg) = @_;
2509		2970
2510	my $range = delete $arg{range};	2971	my $range = delete $arg{range};
2511		2972
2512	my $self = $class->SUPER::new (	2973	my $self = $class->SUPER::new (
2513	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2974	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2514	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2975	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2515	to_value => sub { shift },	2976	to_value => sub { shift },
2516	from_value => sub { shift },	2977	from_value => sub { shift },
2517	%arg,	2978	%arg,
2518	);	2979	);
2519		2980
…		…
2539	sub set_range { shift->{slider}->set_range (@_) }	3000	sub set_range { shift->{slider}->set_range (@_) }
2540	sub set_value { shift->{slider}->set_value (@_) }	3001	sub set_value { shift->{slider}->set_value (@_) }
2541		3002
2542	#############################################################################	3003	#############################################################################
2543		3004
2544	package CFClient::UI::TextScroller;	3005	package CFPlus::UI::TextScroller;
2545		3006
2546	our @ISA = CFClient::UI::HBox::;	3007	our @ISA = CFPlus::UI::HBox::;
2547		3008
2548	use CFClient::OpenGL;	3009	use CFPlus::OpenGL;
2549		3010
2550	sub new {	3011	sub new {
2551	my $class = shift;	3012	my $class = shift;
2552		3013
2553	my $self = $class->SUPER::new (	3014	my $self = $class->SUPER::new (
2554	fontsize => 1,	3015	fontsize => 1,
2555	can_events => 0,	3016	can_events => 1,
2556	indent => 0,	3017	indent => 0,
2557	#font => default_font	3018	#font => default_font
2558	@_,	3019	@_,
2559		3020
2560	layout => (new CFClient::Layout 1),	3021	layout => (new CFPlus::Layout),
2561	par => [],	3022	par => [],
		3023	max_par => 0,
2562	height => 0,	3024	height => 0,
2563	children => [	3025	children => [
2564	(new CFClient::UI::Empty expand => 1),	3026	(new CFPlus::UI::Empty expand => 1),
2565	(new CFClient::UI::Slider vertical => 1),	3027	(new CFPlus::UI::Slider vertical => 1),
2566	],	3028	],
2567	);	3029	);
2568		3030
2569	$self->{children}[1]->connect (changed => sub { $self->update });	3031	$self->{children}[1]->connect (changed => sub { $self->update });
2570		3032
…		…
2600		3062
2601	$self->reflow;	3063	$self->reflow;
2602		3064
2603	local $self->{children} = [$empty, $slider];	3065	local $self->{children} = [$empty, $slider];
2604	$self->SUPER::invoke_size_allocate ($w, $h)	3066	$self->SUPER::invoke_size_allocate ($w, $h)
		3067	}
		3068
		3069	sub invoke_mouse_wheel {
		3070	my ($self, $ev) = @_;
		3071
		3072	return 0 unless $ev->{dy}; # only vertical movements
		3073
		3074	$self->{children}[1]->emit (mouse_wheel => $ev);
		3075
		3076	1
2605	}	3077	}
2606		3078
2607	sub get_layout {	3079	sub get_layout {
2608	my ($self, $para) = @_;	3080	my ($self, $para) = @_;
2609		3081
…		…
2637		3109
2638	# todo: base offset on lines or so, not on pixels	3110	# todo: base offset on lines or so, not on pixels
2639	$self->{children}[1]->set_value ($offset);	3111	$self->{children}[1]->set_value ($offset);
2640	}	3112	}
2641		3113
		3114	sub current_paragraph {
		3115	my ($self) = @_;
		3116
		3117	$self->{top_paragraph} - 1
		3118	}
		3119
		3120	sub scroll_to {
		3121	my ($self, $para) = @_;
		3122
		3123	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3124
		3125	$self->{scroll_to} = $para;
		3126	$self->update;
		3127	}
		3128
2642	sub clear {	3129	sub clear {
2643	my ($self) = @_;	3130	my ($self) = @_;
2644		3131
2645	my (undef, undef, @other) = @{ $self->{children} };	3132	my (undef, undef, @other) = @{ $self->{children} };
2646	$self->remove ($_) for @other;	3133	$self->remove ($_) for @other;
…		…
2649	$self->{height} = 0;	3136	$self->{height} = 0;
2650	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3137	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2651	}	3138	}
2652		3139
2653	sub add_paragraph {	3140	sub add_paragraph {
2654	my ($self, $color, $para, $indent) = @_;	3141	my $self = shift;
2655		3142
2656	my ($text, @w) = ref $para ? @$para : $para;	3143	for my $para (@_) {
2657
2658	$para = {	3144	$para = {
		3145	fg => [1, 1, 1, 1],
		3146	indent => 0,
		3147	markup => "",
		3148	widget => [],
		3149	ref $para ? %$para : (markup => $para),
2659	w => 1e10,	3150	w => 1e10,
2660	wrapped => 1,	3151	wrapped => 1,
2661	fg => $color,
2662	indent => $indent,
2663	markup => $text,
2664	widget => \@w,
2665	};	3152	};
2666		3153
2667	$self->add (@w) if @w;	3154	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2668	push @{$self->{par}}, $para;	3155	push @{$self->{par}}, $para;
		3156	}
		3157
		3158	if (my $max = $self->{max_par}) {
		3159	shift @{$self->{par}} while @{$self->{par}} > $max;
		3160	}
2669		3161
2670	$self->{need_reflow}++;	3162	$self->{need_reflow}++;
2671	$self->update;	3163	$self->update;
2672	}	3164	}
2673		3165
2674	sub scroll_to_bottom {	3166	sub scroll_to_bottom {
2675	my ($self) = @_;	3167	my ($self) = @_;
2676		3168
2677	$self->{scroll_to_bottom} = 1;	3169	$self->{scroll_to} = $#{$self->{par}};
2678	$self->update;	3170	$self->update;
2679	}	3171	}
2680		3172
		3173	sub force_uptodate {
		3174	my ($self) = @_;
		3175
		3176	if (delete $self->{need_reflow}) {
		3177	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3178
		3179	my $height = 0;
		3180
		3181	for my $para (@{$self->{par}}) {
		3182	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3183	my $layout = $self->get_layout ($para);
		3184	my ($w, $h) = $layout->size;
		3185
		3186	$para->{w} = $w + $para->{indent};
		3187	$para->{h} = $h;
		3188	$para->{wrapped} = $layout->has_wrapped;
		3189	}
		3190
		3191	$para->{y} = $height;
		3192	$height += $para->{h};
		3193	}
		3194
		3195	$self->{height} = $height;
		3196	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3197
		3198	delete $self->{texture};
		3199	}
		3200
		3201	if (my $paridx = delete $self->{scroll_to}) {
		3202	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3203	}
		3204	}
		3205
2681	sub update {	3206	sub update {
2682	my ($self) = @_;	3207	my ($self) = @_;
2683		3208
2684	$self->SUPER::update;	3209	$self->SUPER::update;
2685		3210
2686	return unless $self->{h} > 0;	3211	return unless $self->{h} > 0;
2687		3212
2688	delete $self->{texture};	3213	delete $self->{texture};
2689		3214
2690	$ROOT->on_post_alloc ($self => sub {	3215	$ROOT->on_post_alloc ($self => sub {
		3216	$self->force_uptodate;
		3217
2691	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3218	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2692		3219
2693	if (delete $self->{need_reflow}) {
2694	my $height = 0;
2695
2696	for my $para (@{$self->{par}}) {
2697	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2698	my $layout = $self->get_layout ($para);
2699	my ($w, $h) = $layout->size;
2700
2701	$para->{w} = $w + $para->{indent};
2702	$para->{h} = $h;
2703	$para->{wrapped} = $layout->has_wrapped;
2704	}
2705
2706	$height += $para->{h};
2707	}
2708
2709	$self->{height} = $height;
2710
2711	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2712
2713	delete $self->{texture};
2714	}
2715
2716	if (delete $self->{scroll_to_bottom}) {
2717	$self->{children}[1]->set_value (1e10);
2718	}
2719
2720	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3220	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2721	glClearColor 0, 0, 0, 0;	3221	glClearColor 0, 0, 0, 0;
2722	glClear GL_COLOR_BUFFER_BIT;	3222	glClear GL_COLOR_BUFFER_BIT;
2723		3223
		3224	package CFPlus::UI::Base;
		3225	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3226	(0, 0, $self->{w}, $self->{h});
		3227
		3228	my $top = int $self->{children}[1]{range}[0];
		3229
		3230	my $paridx = 0;
		3231	my $top_paragraph;
2724	my $top = int $self->{children}[1]{range}[0];	3232	my $top = int $self->{children}[1]{range}[0];
2725		3233
2726	my $y0 = $top;	3234	my $y0 = $top;
2727	my $y1 = $top + $H;	3235	my $y1 = $top + $H;
2728		3236
2729	my $y = 0;
2730
2731	glEnable GL_BLEND;
2732	#TODO# not correct in windows where rgba is forced off
2733	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2734
2735	for my $para (@{$self->{par}}) {	3237	for my $para (@{$self->{par}}) {
2736	my $h = $para->{h};	3238	my $h = $para->{h};
		3239	my $y = $para->{y};
2737		3240
2738	if ($y0 < $y + $h && $y < $y1) {	3241	if ($y0 < $y + $h && $y < $y1) {
2739
2740	my $layout = $self->get_layout ($para);	3242	my $layout = $self->get_layout ($para);
2741		3243
2742	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744	glRasterPos $para->{indent}, $y - $y0;	3244	$layout->render ($para->{indent}, $y - $y0);
2745	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746		3245
2747	if (my @w = @{ $para->{widget} }) {	3246	if (my @w = @{ $para->{widget} }) {
2748	my @s = $layout->get_shapes;	3247	my @s = $layout->get_shapes;
2749		3248
2750	glDisable GL_BLEND;
2751	for (@w) {	3249	for (@w) {
2752	my ($dx, $dy) = splice @s, 0, 2, ();	3250	my ($dx, $dy) = splice @s, 0, 2, ();
2753		3251
2754	$_->{x} = $dx + $para->{indent};	3252	$_->{x} = $dx + $para->{indent};
2755	$_->{y} = $dy + $y - $y0;	3253	$_->{y} = $dy + $y - $y0;
2756		3254
2757	$_->draw;	3255	$_->draw;
2758	}	3256	}
2759	glEnable GL_BLEND;
2760	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761	}	3257	}
2762	}	3258	}
2763		3259
2764	$y += $h;	3260	$paridx++;
		3261	$top_paragraph ||= $paridx if $y >= $top;
2765	}	3262	}
2766		3263
2767	glDisable GL_BLEND;	3264	$self->{top_paragraph} = $top_paragraph;
2768	};	3265	};
2769	});	3266	});
2770	}	3267	}
2771		3268
2772	sub reconfigure {	3269	sub reconfigure {
…		…
2790	$self->{children}[1]->draw;	3287	$self->{children}[1]->draw;
2791	}	3288	}
2792		3289
2793	#############################################################################	3290	#############################################################################
2794		3291
2795	package CFClient::UI::Animator;	3292	package CFPlus::UI::Animator;
2796		3293
2797	use CFClient::OpenGL;	3294	use CFPlus::OpenGL;
2798		3295
2799	our @ISA = CFClient::UI::Bin::;	3296	our @ISA = CFPlus::UI::Bin::;
2800		3297
2801	sub moveto {	3298	sub moveto {
2802	my ($self, $x, $y) = @_;	3299	my ($self, $x, $y) = @_;
2803		3300
2804	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3301	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2832	glPopMatrix;	3329	glPopMatrix;
2833	}	3330	}
2834		3331
2835	#############################################################################	3332	#############################################################################
2836		3333
2837	package CFClient::UI::Flopper;	3334	package CFPlus::UI::Flopper;
2838		3335
2839	our @ISA = CFClient::UI::Button::;	3336	our @ISA = CFPlus::UI::Button::;
2840		3337
2841	sub new {	3338	sub new {
2842	my $class = shift;	3339	my $class = shift;
2843		3340
2844	my $self = $class->SUPER::new (	3341	my $self = $class->SUPER::new (
…		…
2856	$self->{other}->toggle_visibility;	3353	$self->{other}->toggle_visibility;
2857	}	3354	}
2858		3355
2859	#############################################################################	3356	#############################################################################
2860		3357
2861	package CFClient::UI::Tooltip;	3358	package CFPlus::UI::Tooltip;
2862		3359
2863	our @ISA = CFClient::UI::Bin::;	3360	our @ISA = CFPlus::UI::Bin::;
2864		3361
2865	use CFClient::OpenGL;	3362	use CFPlus::OpenGL;
2866		3363
2867	sub new {	3364	sub new {
2868	my $class = shift;	3365	my $class = shift;
2869		3366
2870	$class->SUPER::new (	3367	$class->SUPER::new (
…		…
2873	)	3370	)
2874	}	3371	}
2875		3372
2876	sub set_tooltip_from {	3373	sub set_tooltip_from {
2877	my ($self, $widget) = @_;	3374	my ($self, $widget) = @_;
		3375
		3376	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3377	if $widget->{tooltip} =~ /^#(.*)$/;
2878		3378
2879	my $tooltip = $widget->{tooltip};	3379	my $tooltip = $widget->{tooltip};
2880		3380
2881	if ($ENV{CFPLUS_DEBUG} & 2) {	3381	if ($ENV{CFPLUS_DEBUG} & 2) {
2882	$tooltip .= "\n\n" . (ref $widget) . "\n"	3382	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2886	}	3386	}
2887		3387
2888	$tooltip =~ s/^\n+//;	3388	$tooltip =~ s/^\n+//;
2889	$tooltip =~ s/\n+$//;	3389	$tooltip =~ s/\n+$//;
2890		3390
2891	$self->add (new CFClient::UI::Label	3391	$self->add (new CFPlus::UI::Label
2892	markup => $tooltip,	3392	markup => $tooltip,
2893	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3393	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2894	fontsize => 0.8,	3394	fontsize => 0.8,
2895	fg => [0, 0, 0, 1],	3395	style => 1, # FLAG_INVERSE
2896	ellipsise => 0,	3396	ellipsise => 0,
2897	font => ($widget->{tooltip_font} || $::FONT_PROP),	3397	font => ($widget->{tooltip_font} || $::FONT_PROP),
2898	);	3398	);
2899	}	3399	}
2900		3400
…		…
2919		3419
2920	$self->{root}->on_post_alloc ("move_$self" => sub {	3420	$self->{root}->on_post_alloc ("move_$self" => sub {
2921	my $widget = $self->{owner}	3421	my $widget = $self->{owner}
2922	or return;	3422	or return;
2923		3423
		3424	if ($widget->{visible}) {
2924	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3425	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2925		3426
2926	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3427	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2927	if $x + $self->{w} > $self->{root}{w};	3428	if $x + $self->{w} > $self->{root}{w};
2928		3429
2929	$self->move_abs ($x, $y);	3430	$self->move_abs ($x, $y);
		3431	} else {
		3432	$self->hide;
		3433	}
2930	});	3434	});
2931	}	3435	}
2932		3436
2933	sub _draw {	3437	sub _draw {
2934	my ($self) = @_;	3438	my ($self) = @_;
…		…
2958	$self->SUPER::_draw;	3462	$self->SUPER::_draw;
2959	}	3463	}
2960		3464
2961	#############################################################################	3465	#############################################################################
2962		3466
2963	package CFClient::UI::Face;	3467	package CFPlus::UI::Face;
2964		3468
2965	our @ISA = CFClient::UI::Base::;	3469	our @ISA = CFPlus::UI::DrawBG::;
2966		3470
2967	use CFClient::OpenGL;	3471	use CFPlus::OpenGL;
2968		3472
2969	sub new {	3473	sub new {
2970	my $class = shift;	3474	my $class = shift;
2971		3475
2972	my $self = $class->SUPER::new (	3476	my $self = $class->SUPER::new (
		3477	size_w => 32,
		3478	size_h => 8,
2973	aspect => 1,	3479	aspect => 1,
2974	can_events => 0,	3480	can_events => 0,
2975	@_,	3481	@_,
2976	);	3482	);
2977		3483
2978	if ($self->{anim} && $self->{animspeed}) {	3484	if ($self->{anim} && $self->{animspeed}) {
2979	Scalar::Util::weaken (my $widget = $self);	3485	CFPlus::weaken (my $widget = $self);
2980		3486
		3487	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3488	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2981	$self->{timer} = Event->timer (	3489	$self->{timer} = Event->timer (
2982	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2983	hard => 1,	3490	parked => 1,
2984	interval => $self->{animspeed},
2985	cb => sub {	3491	cb => sub {
		3492	return unless $::CONN && $widget;
		3493
2986	++$widget->{frame};	3494	++$widget->{frame};
		3495	$widget->update_face;
2987	$widget->update;	3496	$widget->update;
		3497
		3498	$widget->update_timer;
2988	},	3499	},
2989	);	3500	);
		3501
		3502	$self->update_face;
		3503	$self->update_timer;
2990	}	3504	}
2991		3505
2992	$self	3506	$self
2993	}	3507	}
2994		3508
		3509	sub update_timer {
		3510	my ($self) = @_;
		3511
		3512	return unless $self->{timer};
		3513
		3514	if ($self->{visible}) {
		3515	$self->{timer}->at (
		3516	$self->{anim_start}
		3517	+ $self->{animspeed}
		3518	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3519	);
		3520	$self->{timer}->start;
		3521	} else {
		3522	$self->{timer}->stop;
		3523	}
		3524	}
		3525
		3526	sub update_face {
		3527	my ($self) = @_;
		3528
		3529	return unless $::CONN;
		3530
		3531	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3532	if ($anim && @$anim) {
		3533	delete $self->{wait_face};
		3534	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3535	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
		3536	}
		3537	}
		3538	}
		3539
2995	sub size_request {	3540	sub size_request {
2996	(32, 8)	3541	my ($self) = @_;
		3542
		3543	if ($::CONN) {
		3544	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3545	if (my $tex = $::CONN->{texture}[$faceid]) {
		3546	$self->{tex} = $tex;
		3547	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3548	} else {
		3549	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3550	$self->realloc;
		3551	});
		3552	}
		3553	}
		3554	}
		3555
		3556	($self->{size_w} || 8, $self->{size_h} || 8)
2997	}	3557	}
2998		3558
2999	sub update {	3559	sub update {
3000	my ($self) = @_;	3560	my ($self) = @_;
3001		3561
3002	return unless $self->{visible};	3562	return unless $self->{visible};
3003		3563
3004	$self->SUPER::update;	3564	$self->SUPER::update;
3005	}	3565	}
3006		3566
		3567	sub invoke_visibility_change {
		3568	my ($self) = @_;
		3569
		3570	$self->update_timer;
		3571
		3572	0
		3573	}
		3574
3007	sub _draw {	3575	sub _draw {
3008	my ($self) = @_;	3576	my ($self) = @_;
3009		3577
3010	return unless $::CONN;	3578	$self->SUPER::_draw;
3011		3579
3012	my $face;	3580	if (my $tex = $self->{tex}) {
3013
3014	if ($self->{frame}) {
3015	my $anim = $::CONN->{anim}[$self->{anim}];
3016
3017	$face = $anim->[ $self->{frame} % @$anim ]
3018	if $anim && @$anim;
3019	}
3020
3021	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3022
3023	if ($tex) {
3024	glEnable GL_TEXTURE_2D;	3581	glEnable GL_TEXTURE_2D;
3025	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3582	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3026	glColor 0, 0, 0, 1;	3583	glColor 0, 0, 0, 1;
3027	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3584	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3028	glDisable GL_TEXTURE_2D;	3585	glDisable GL_TEXTURE_2D;
…		…
3030	}	3587	}
3031		3588
3032	sub destroy {	3589	sub destroy {
3033	my ($self) = @_;	3590	my ($self) = @_;
3034		3591
3035	$self->{timer}->cancel	3592	(delete $self->{timer})->cancel
3036	if $self->{timer};	3593	if $self->{timer};
3037		3594
3038	$self->SUPER::destroy;	3595	$self->SUPER::destroy;
3039	}	3596	}
3040		3597
3041	#############################################################################	3598	#############################################################################
3042		3599
3043	package CFClient::UI::Buttonbar;	3600	package CFPlus::UI::Buttonbar;
3044		3601
3045	our @ISA = CFClient::UI::HBox::;	3602	our @ISA = CFPlus::UI::HBox::;
3046		3603
3047	# TODO: should actualyl wrap buttons and other goodies.	3604	# TODO: should actually wrap buttons and other goodies.
3048		3605
3049	#############################################################################	3606	#############################################################################
3050		3607
3051	package CFClient::UI::Menu;	3608	package CFPlus::UI::Menu;
3052		3609
3053	our @ISA = CFClient::UI::FancyFrame::;	3610	our @ISA = CFPlus::UI::Toplevel::;
3054		3611
3055	use CFClient::OpenGL;	3612	use CFPlus::OpenGL;
3056		3613
3057	sub new {	3614	sub new {
3058	my $class = shift;	3615	my $class = shift;
3059		3616
3060	my $self = $class->SUPER::new (	3617	my $self = $class->SUPER::new (
3061	items => [],	3618	items => [],
3062	z => 100,	3619	z => 100,
3063	@_,	3620	@_,
3064	);	3621	);
3065		3622
3066	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3623	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3067		3624
3068	for my $item (@{ $self->{items} }) {	3625	for my $item (@{ $self->{items} }) {
3069	my ($widget, $cb, $tooltip) = @$item;	3626	my ($widget, $cb, $tooltip) = @$item;
3070		3627
3071	# handle various types of items, only text for now	3628	# handle various types of items, only text for now
3072	if (!ref $widget) {	3629	if (!ref $widget) {
		3630	if ($widget =~ /\t/) {
		3631	my ($left, $right) = split /\t/, $widget, 2;
		3632
3073	$widget = new CFClient::UI::Label	3633	$widget = new CFPlus::UI::HBox
3074	can_hover => 1,	3634	can_hover => 1,
3075	can_events => 1,	3635	can_events => 1,
		3636	tooltip => $tooltip,
		3637	children => [
		3638	(new CFPlus::UI::Label markup => $left, expand => 1),
		3639	(new CFPlus::UI::Label markup => $right, align => +1),
		3640	],
		3641	;
		3642
		3643	} else {
		3644	$widget = new CFPlus::UI::Label
		3645	can_hover => 1,
		3646	can_events => 1,
3076	markup => $widget,	3647	markup => $widget,
3077	tooltip => $tooltip	3648	tooltip => $tooltip;
		3649	}
3078	}	3650	}
3079		3651
3080	$self->{item}{$widget} = $item;	3652	$self->{item}{$widget} = $item;
3081		3653
3082	$self->{vbox}->add ($widget);	3654	$self->{vbox}->add ($widget);
…		…
3125	1	3697	1
3126	}	3698	}
3127		3699
3128	#############################################################################	3700	#############################################################################
3129		3701
3130	package CFClient::UI::Multiplexer;	3702	package CFPlus::UI::Multiplexer;
3131		3703
3132	our @ISA = CFClient::UI::Container::;	3704	our @ISA = CFPlus::UI::Container::;
3133		3705
3134	sub new {	3706	sub new {
3135	my $class = shift;	3707	my $class = shift;
3136		3708
3137	my $self = $class->SUPER::new (	3709	my $self = $class->SUPER::new (
…		…
3151		3723
3152	$self->{current} = $self->{children}[0]	3724	$self->{current} = $self->{children}[0]
3153	if @{ $self->{children} };	3725	if @{ $self->{children} };
3154	}	3726	}
3155		3727
		3728	sub get_current_page {
		3729	my ($self) = @_;
		3730
		3731	$self->{current}
		3732	}
		3733
3156	sub set_current_page {	3734	sub set_current_page {
3157	my ($self, $page_or_widget) = @_;	3735	my ($self, $page_or_widget) = @_;
3158		3736
3159	my $widget = ref $page_or_widget	3737	my $widget = ref $page_or_widget
3160	? $page_or_widget	3738	? $page_or_widget
…		…
3192	$self->{current}->draw;	3770	$self->{current}->draw;
3193	}	3771	}
3194		3772
3195	#############################################################################	3773	#############################################################################
3196		3774
3197	package CFClient::UI::Notebook;	3775	package CFPlus::UI::Notebook;
3198		3776
3199	our @ISA = CFClient::UI::VBox::;	3777	our @ISA = CFPlus::UI::VBox::;
3200		3778
3201	sub new {	3779	sub new {
3202	my $class = shift;	3780	my $class = shift;
3203		3781
3204	my $self = $class->SUPER::new (	3782	my $self = $class->SUPER::new (
3205	buttonbar => (new CFClient::UI::Buttonbar),	3783	buttonbar => (new CFPlus::UI::Buttonbar),
3206	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3784	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3207	# filter => # will be put between multiplexer and $self	3785	# filter => # will be put between multiplexer and $self
3208	@_,	3786	@_,
3209	);	3787	);
3210		3788
3211	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3789	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3215	}	3793	}
3216		3794
3217	sub add {	3795	sub add {
3218	my ($self, $title, $widget, $tooltip) = @_;	3796	my ($self, $title, $widget, $tooltip) = @_;
3219		3797
3220	Scalar::Util::weaken $self;	3798	CFPlus::weaken $self;
3221		3799
3222	$self->{buttonbar}->add (new CFClient::UI::Button	3800	$self->{buttonbar}->add (new CFPlus::UI::Button
3223	markup => $title,	3801	markup => $title,
3224	tooltip => $tooltip,	3802	tooltip => $tooltip,
3225	on_activate => sub { $self->set_current_page ($widget) },	3803	on_activate => sub { $self->set_current_page ($widget) },
3226	);	3804	);
3227		3805
3228	$self->{multiplexer}->add ($widget);	3806	$self->{multiplexer}->add ($widget);
3229	}	3807	}
3230		3808
		3809	sub get_current_page {
		3810	my ($self) = @_;
		3811
		3812	$self->{multiplexer}->get_current_page
		3813	}
		3814
3231	sub set_current_page {	3815	sub set_current_page {
3232	my ($self, $page) = @_;	3816	my ($self, $page) = @_;
3233		3817
3234	$self->{multiplexer}->set_current_page ($page);	3818	$self->{multiplexer}->set_current_page ($page);
3235	$self->emit (page_changed => $self->{multiplexer}{current});	3819	$self->emit (page_changed => $self->{multiplexer}{current});
3236	}	3820	}
3237		3821
3238	#############################################################################	3822	#############################################################################
3239		3823
3240	package CFClient::UI::Combobox;	3824	package CFPlus::UI::Selector;
3241		3825
3242	use utf8;	3826	use utf8;
3243		3827
3244	our @ISA = CFClient::UI::Button::;	3828	our @ISA = CFPlus::UI::Button::;
3245		3829
3246	sub new {	3830	sub new {
3247	my $class = shift;	3831	my $class = shift;
3248		3832
3249	my $self = $class->SUPER::new (	3833	my $self = $class->SUPER::new (
…		…
3266	my ($value, $title, $tooltip) = @$_;	3850	my ($value, $title, $tooltip) = @$_;
3267		3851
3268	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3852	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269	}	3853	}
3270		3854
3271	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3855	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272	}	3856	}
3273		3857
3274	sub _set_value {	3858	sub _set_value {
3275	my ($self, $value) = @_;	3859	my ($self, $value) = @_;
3276		3860
…		…
3291	$self->emit (changed => $value);	3875	$self->emit (changed => $value);
3292	}	3876	}
3293		3877
3294	#############################################################################	3878	#############################################################################
3295		3879
3296	package CFClient::UI::Statusbox;	3880	package CFPlus::UI::Statusbox;
3297		3881
3298	our @ISA = CFClient::UI::VBox::;	3882	our @ISA = CFPlus::UI::VBox::;
3299		3883
3300	sub new {	3884	sub new {
3301	my $class = shift;	3885	my $class = shift;
3302		3886
3303	my $self = $class->SUPER::new (	3887	my $self = $class->SUPER::new (
3304	fontsize => 0.8,	3888	fontsize => 0.8,
3305	@_,	3889	@_,
3306	);	3890	);
3307		3891
3308	Scalar::Util::weaken (my $this = $self);	3892	CFPlus::weaken (my $this = $self);
3309		3893
3310	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3894	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3311		3895
3312	$self	3896	$self
3313	}	3897	}
…		…
3315	sub reorder {	3899	sub reorder {
3316	my ($self) = @_;	3900	my ($self) = @_;
3317	my $NOW = Time::HiRes::time;	3901	my $NOW = Time::HiRes::time;
3318		3902
3319	# freeze display when hovering over any label	3903	# freeze display when hovering over any label
3320	return if $CFClient::UI::TOOLTIP->{owner}	3904	return if $CFPlus::UI::TOOLTIP->{owner}
3321	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3905	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3322	values %{ $self->{item} };	3906	values %{ $self->{item} };
3323		3907
3324	while (my ($k, $v) = each %{ $self->{item} }) {	3908	while (my ($k, $v) = each %{ $self->{item} }) {
3325	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3909	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3326	}	3910	}
…		…
3347	for ($short) {	3931	for ($short) {
3348	s/^\s+//;	3932	s/^\s+//;
3349	s/\s+/ /g;	3933	s/\s+/ /g;
3350	}	3934	}
3351		3935
3352	new CFClient::UI::Label	3936	new CFPlus::UI::Label
3353	markup => $short,	3937	markup => $short,
3354	tooltip => $item->{tooltip},	3938	tooltip => $item->{tooltip},
3355	tooltip_font => $::FONT_PROP,	3939	tooltip_font => $::FONT_PROP,
3356	tooltip_width => 0.67,	3940	tooltip_width => 0.67,
3357	fontsize => $item->{fontsize} || $self->{fontsize},	3941	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3436	$self->SUPER::destroy;	4020	$self->SUPER::destroy;
3437	}	4021	}
3438		4022
3439	#############################################################################	4023	#############################################################################
3440		4024
3441	package CFClient::UI::Inventory;
3442
3443	our @ISA = CFClient::UI::ScrolledWindow::;
3444
3445	sub new {
3446	my $class = shift;
3447
3448	my $self = $class->SUPER::new (
3449	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3450	@_,
3451	);
3452
3453	$self
3454	}
3455
3456	sub set_items {
3457	my ($self, $items) = @_;
3458
3459	$self->{child}->clear;
3460	return unless $items;
3461
3462	my @items = sort {
3463	($a->{type} <=> $b->{type})
3464	or ($a->{name} cmp $b->{name})
3465	} values %$items;
3466
3467	$self->{real_items} = \@items;
3468
3469	my $row = 0;
3470	for my $item (@items) {
3471	CFClient::Item::update_widgets $item;
3472
3473	$self->{child}->add (0, $row, $item->{face_widget});
3474	$self->{child}->add (1, $row, $item->{desc_widget});
3475	$self->{child}->add (2, $row, $item->{weight_widget});
3476
3477	$row++;
3478	}
3479	}
3480
3481	#############################################################################
3482
3483	package CFClient::UI::SpellList;
3484
3485	our @ISA = CFClient::UI::Table::;
3486
3487	sub new {
3488	my $class = shift;
3489
3490	my $self = $class->SUPER::new (
3491	binding => [],
3492	commands => [],
3493	@_,
3494	)
3495	}
3496
3497	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3498
3499	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3500	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3501	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3509
3510	sub rebuild_spell_list {
3511	my ($self) = @_;
3512
3513	$CFClient::UI::ROOT->on_refresh ($self => sub {
3514	$self->clear;
3515
3516	return unless $::CONN;
3517
3518	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524	my $row = 0;
3525
3526	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527	my $spell = $self->{spell}{$_};
3528
3529	$row++;
3530
3531	my $spell_cb = sub {
3532	my ($widget, $ev) = @_;
3533
3534	if ($ev->{button} == 1) {
3535	$::CONN->user_send ("cast $spell->{name}");
3536	} elsif ($ev->{button} == 2) {
3537	$::CONN->user_send ("invoke $spell->{name}");
3538	} elsif ($ev->{button} == 3) {
3539	(new CFClient::UI::Menu
3540	items => [
3541	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543	],
3544	)->popup ($ev);
3545	} else {
3546	return 0;
3547	}
3548
3549	1
3550	};
3551
3552	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554	#TODO: add path info to tooltip
3555	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557	$self->add (0, $row, new CFClient::UI::Face
3558	face => $spell->{face},
3559	can_hover => 1,
3560	can_events => 1,
3561	tooltip => $tooltip,
3562	on_button_down => $spell_cb,
3563	);
3564
3565	$self->add (1, $row, new CFClient::UI::Label
3566	expand => 1,
3567	text => $spell->{name},
3568	can_hover => 1,
3569	can_events => 1,
3570	tooltip => $tooltip,
3571	on_button_down => $spell_cb,
3572	);
3573
3574	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3578	}
3579	});
3580	}
3581
3582	sub add_spell {
3583	my ($self, $spell) = @_;
3584
3585	$self->{spell}->{$spell->{name}} = $spell;
3586	$self->rebuild_spell_list;
3587	}
3588
3589	sub remove_spell {
3590	my ($self, $spell) = @_;
3591
3592	delete $self->{spell}->{$spell->{name}};
3593	$self->rebuild_spell_list;
3594	}
3595
3596	sub clear_spells {
3597	my ($self) = @_;
3598
3599	$self->{spell} = {};
3600	$self->rebuild_spell_list;
3601	}
3602
3603	#############################################################################
3604
3605	package CFClient::UI::Root;	4025	package CFPlus::UI::Root;
3606		4026
3607	our @ISA = CFClient::UI::Container::;	4027	our @ISA = CFPlus::UI::Container::;
3608		4028
3609	use List::Util qw(min max);	4029	use List::Util qw(min max);
3610		4030
3611	use CFClient::OpenGL;	4031	use CFPlus::OpenGL;
3612		4032
3613	sub new {	4033	sub new {
3614	my $class = shift;	4034	my $class = shift;
3615		4035
3616	my $self = $class->SUPER::new (	4036	my $self = $class->SUPER::new (
3617	visible => 1,	4037	visible => 1,
3618	@_,	4038	@_,
3619	);	4039	);
3620		4040
3621	Scalar::Util::weaken ($self->{root} = $self);	4041	CFPlus::weaken ($self->{root} = $self);
3622		4042
3623	$self	4043	$self
3624	}	4044	}
3625		4045
3626	sub size_request {	4046	sub size_request {
…		…
3721	while ($self->{refresh_hook}) {	4141	while ($self->{refresh_hook}) {
3722	$_->()	4142	$_->()
3723	for values %{delete $self->{refresh_hook}};	4143	for values %{delete $self->{refresh_hook}};
3724	}	4144	}
3725		4145
3726	if ($self->{realloc}) {	4146	while ($self->{realloc}) {
3727	my %queue;	4147	my %queue;
3728	my @queue;	4148	my @queue;
3729	my $widget;	4149	my $widget;
3730		4150
3731	outer:	4151	outer:
…		…
3778	}	4198	}
3779	}	4199	}
3780		4200
3781	delete $self->{realloc}{$widget+0};	4201	delete $self->{realloc}{$widget+0};
3782	}	4202	}
3783	}
3784		4203
3785	while (my $size_alloc = delete $self->{size_alloc}) {	4204	while (my $size_alloc = delete $self->{size_alloc}) {
3786	my @queue = sort { $b->{visible} <=> $a->{visible} }	4205	my @queue = sort { $a->{visible} <=> $b->{visible} }
3787	values %$size_alloc;	4206	values %$size_alloc;
3788		4207
3789	while () {	4208	while () {
3790	my $widget = pop @queue || last;	4209	my $widget = pop @queue || last;
3791		4210
3792	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4211	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3793		4212
3794	$w = 0 if $w < 0;	4213	$w = max $widget->{min_w}, $w;
3795	$h = 0 if $h < 0;	4214	$h = max $widget->{min_h}, $h;
3796		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
3797	$w = int $w + 0.5;	4222	$w = int $w + 0.5;
3798	$h = int $h + 0.5;	4223	$h = int $h + 0.5;
3799		4224
3800	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}) {
3801	$widget->{old_w} = $widget->{w};	4226	$widget->{old_w} = $widget->{w};
3802	$widget->{old_h} = $widget->{h};	4227	$widget->{old_h} = $widget->{h};
3803		4228
3804	$widget->{w} = $w;	4229	$widget->{w} = $w;
3805	$widget->{h} = $h;	4230	$widget->{h} = $h;
3806		4231
3807	$widget->emit (size_allocate => $w, $h);	4232	$widget->emit (size_allocate => $w, $h);
		4233	}
3808	}	4234	}
3809	}	4235	}
3810	}	4236	}
3811		4237
3812	while ($self->{post_alloc_hook}) {	4238	while ($self->{post_alloc_hook}) {
3813	$_->()	4239	$_->()
3814	for values %{delete $self->{post_alloc_hook}};	4240	for values %{delete $self->{post_alloc_hook}};
3815	}	4241	}
3816
3817		4242
3818	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4243	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3819	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4244	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3820	glClear GL_COLOR_BUFFER_BIT;	4245	glClear GL_COLOR_BUFFER_BIT;
3821		4246
…		…
3824	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4249	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3825	glMatrixMode GL_MODELVIEW;	4250	glMatrixMode GL_MODELVIEW;
3826	glLoadIdentity;	4251	glLoadIdentity;
3827		4252
3828	{	4253	{
3829	package CFClient::UI::Base;	4254	package CFPlus::UI::Base;
3830		4255
3831	($draw_x, $draw_y, $draw_w, $draw_h) =	4256	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3832	(0, 0, $self->{w}, $self->{h});	4257	(0, 0, $self->{w}, $self->{h});
3833	}
3834		4258
3835	$self->_draw;	4259	$self->_draw;
		4260	}
3836	}	4261	}
3837		4262
3838	#############################################################################	4263	#############################################################################
3839		4264
3840	package CFClient::UI;	4265	package CFPlus::UI;
3841		4266
3842	$ROOT = new CFClient::UI::Root;	4267	$ROOT = new CFPlus::UI::Root;
3843	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4268	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3844		4269
3845	1	4270	1
3846		4271

Diff Legend

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