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.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.265 by root, Thu Jun 1 02:59:46 2006 UTC

…		…
17	our $BUTTON_STATE;	17	our $BUTTON_STATE;
18		18
19	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
20		20
21	sub get_layout {	21	sub get_layout {
		22	my $layout;
		23
22	for (grep { $_->{name} } values %WIDGET) {	24	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {	25	my $win = $layout->{$_->{name}} = { };
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};	26
29	}	27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30		31
31	return $LAYOUT;	32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
32	}	36	}
33		37
34	sub set_layout {	38	sub set_layout {
35	my ($layout) = @_;	39	my ($layout) = @_;
		40
36	$LAYOUT = $layout;	41	$LAYOUT = $layout;
37	}	42	}
38		43
39	sub check_tooltip {	44	sub check_tooltip {
40	if (!$GRAB) {	45	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	46	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	47	if (length $widget->{tooltip}) {
43		48
44	if ($TOOLTIP->{owner} != $widget) {	49	if ($TOOLTIP->{owner} != $widget) {
		50	$TOOLTIP->hide;
		51
45	$TOOLTIP->{owner} = $widget;	52	$TOOLTIP->{owner} = $widget;
46		53
47	my $tip = $widget->{tooltip};	54	my $tip = $widget->{tooltip};
48		55
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	56	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		57
51	$TOOLTIP->set_tooltip_from ($widget);	58	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	59	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->check_size;
61	$TOOLTIP->update;
62	}	60	}
63		61
64	return;	62	return;
65	}	63	}
66	}	64	}
…		…
172	sub rescale_widgets {	170	sub rescale_widgets {
173	my ($sx, $sy) = @_;	171	my ($sx, $sy) = @_;
174		172
175	for my $widget (values %WIDGET) {	173	for my $widget (values %WIDGET) {
176	if ($widget->{is_toplevel}) {	174	if ($widget->{is_toplevel}) {
		175	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		176	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		177
177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	178	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	179	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	180	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	181	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	183	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	184
		185	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		186	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		187
185	}	188	}
186	}	189	}
187		190
188	reconfigure_widgets;	191	reconfigure_widgets;
189	}	192	}
…		…
198		201
199	sub new {	202	sub new {
200	my $class = shift;	203	my $class = shift;
201		204
202	my $self = bless {	205	my $self = bless {
203	x => 0,	206	x => "center",
204	y => 0,	207	y => "center",
205	z => 0,	208	z => 0,
		209	w => undef,
		210	h => undef,
206	can_events => 1,	211	can_events => 1,
207	@_	212	@_
208	}, $class;	213	}, $class;
		214
		215	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209		216
210	for (keys %$self) {	217	for (keys %$self) {
211	if (/^on_(.*)$/) {	218	if (/^on_(.*)$/) {
212	$self->connect ($1 => delete $self->{$_});	219	$self->connect ($1 => delete $self->{$_});
213	}	220	}
214	}	221	}
215		222
216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	223	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219	$self->{user_x} = $layout->{x} * $::WIDTH;	224	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220	$self->{user_y} = $layout->{y} * $::HEIGHT;	225	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221	$self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	226	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222	$self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	227	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		228
		229	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		230	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		231
		232	$self->show if $layout->{show};
223	}	233	}
224		234
225	$self	235	$self
226	}	236	}
227		237
…		…
232	%$self = ();	242	%$self = ();
233	}	243	}
234		244
235	sub show {	245	sub show {
236	my ($self) = @_;	246	my ($self) = @_;
		247
237	return if $self->{parent};	248	return if $self->{parent};
238		249
239	$CFClient::UI::ROOT->add ($self);	250	$CFClient::UI::ROOT->add ($self);
240	}	251	}
241		252
242	sub show_centered {	253	sub set_visible {
243	my ($self) = @_;	254	my ($self) = @_;
		255
244	return if $self->{parent};	256	return if $self->{visible};
245		257
246	$self->show;	258	$self->{root} = $self->{parent}{root};
		259	$self->{visible} = $self->{parent}{visible} + 1;
247		260
248	$CFClient::UI::ROOT->on_post_alloc (	261	$self->emit (visibility_change => 1);
249	"centered $self" => sub {	262
250	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	263	$self->realloc if !exists $self->{req_w};
251	},	264
252	);	265	$_->set_visible for $self->children;
253	}	266	}
254		267
255	sub set_invisible {	268	sub set_invisible {
256	my ($self) = @_;	269	my ($self) = @_;
257		270
258	# broken show/hide model	271	return unless $self->{visible};
		272
		273	$_->set_invisible for $self->children;
259		274
260	delete $self->{root};	275	delete $self->{root};
261	delete $self->{visible};	276	delete $self->{visible};
262		277
263	undef $GRAB if $GRAB == $self;	278	undef $GRAB if $GRAB == $self;
264	undef $HOVER if $HOVER == $self;	279	undef $HOVER if $HOVER == $self;
265		280
266	CFClient::UI::check_tooltip	281	CFClient::UI::check_tooltip
267	if $CFClient::UI::TOOLTIP->{owner} == $self;	282	if $TOOLTIP->{owner} == $self;
268		283
269	$self->focus_out;	284	$self->focus_out;
		285
		286	$self->emit (visibility_change => 0);
		287	}
		288
		289	sub set_visibility {
		290	my ($self, $visible) = @_;
		291
		292	return if $self->{visible} == $visible;
		293
		294	$visible ? $self->hide
		295	: $self->show;
		296	}
		297
		298	sub toggle_visibility {
		299	my ($self) = @_;
		300
		301	$self->{visible}
		302	? $self->hide
		303	: $self->show;
270	}	304	}
271		305
272	sub hide {	306	sub hide {
273	my ($self) = @_;	307	my ($self) = @_;
274		308
…		…
276		310
277	$self->{parent}->remove ($self)	311	$self->{parent}->remove ($self)
278	if $self->{parent};	312	if $self->{parent};
279	}	313	}
280		314
281	sub move {	315	sub move_abs {
282	my ($self, $x, $y, $z) = @_;	316	my ($self, $x, $y, $z) = @_;
283		317
284	$self->{x} = int $x;	318	$self->{x} = List::Util::max 0, int $x;
285	$self->{y} = int $y;	319	$self->{y} = List::Util::max 0, int $y;
286	$self->{z} = $z if defined $z;	320	$self->{z} = $z if defined $z;
287		321
288	$self->update;	322	$self->update;
289	}	323	}
290		324
291	sub set_size {	325	sub set_size {
292	my ($self, $w, $h) = @_;	326	my ($self, $w, $h) = @_;
293		327
294	$self->{user_w} = $w;	328	$self->{force_w} = $w;
295	$self->{user_h} = $h;	329	$self->{force_h} = $h;
296		330
297	$self->check_size;	331	$self->realloc;
298	}	332	}
299		333
300	sub size_request {	334	sub size_request {
301	require Carp;	335	require Carp;
302	Carp::confess "size_request is abstract";	336	Carp::confess "size_request is abstract";
…		…
304		338
305	sub configure {	339	sub configure {
306	my ($self, $x, $y, $w, $h) = @_;	340	my ($self, $x, $y, $w, $h) = @_;
307		341
308	if ($self->{aspect}) {	342	if ($self->{aspect}) {
		343	my ($ow, $oh) = ($w, $h);
		344
309	my $w2 = List::Util::min $w, int $h * $self->{aspect};	345	$w = List::Util::min $w, int $h * $self->{aspect};
310	my $h2 = List::Util::min $h, int $w / $self->{aspect};	346	$h = List::Util::min $h, int $w / $self->{aspect};
311		347
312	# use alignment to adjust x, y	348	# use alignment to adjust x, y
313		349
314	$x += int +($w - $w2) * 0.5;	350	$x += int 0.5 * ($ow - $w);
315	$y += int +($h - $h2) * 0.5;	351	$y += int 0.5 * ($oh - $h);
316
317	($w, $h) = ($w2, $h2);
318	}	352	}
319		353
320	if ($self->{x} != $x || $self->{y} != $y) {	354	if ($self->{x} ne $x || $self->{y} ne $y) {
321	$self->{x} = $x;	355	$self->{x} = $x;
322	$self->{y} = $y;	356	$self->{y} = $y;
323	$self->update;	357	$self->update;
324	}	358	}
325		359
326	if ($self->{w} != $w || $self->{h} != $h) {	360	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	361	return unless $self->{visible};
		362
		363	$self->{alloc_w} = $w;
		364	$self->{alloc_h} = $h;
		365
		366	$self->{root}{size_alloc}{$self+0} = $self;
328	}	367	}
329	}	368	}
330		369
331	sub size_allocate {	370	sub size_allocate {
332	# nothing to be done	371	# nothing to be done
333	}
334
335	sub reconfigure {
336	my ($self) = @_;
337
338	$self->check_size (1);
339	$self->update;
340	}	372	}
341		373
342	sub children {	374	sub children {
343	}	375	}
344		376
…		…
422	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	454	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
423	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	455	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
424	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	456	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
425	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	457	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
426	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	458	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		459
		460	sub find_widget {
		461	my ($self, $x, $y) = @_;
		462
		463	return () unless $self->{can_events};
		464
		465	return $self
		466	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		467	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		468
		469	()
		470	}
		471
		472	sub set_parent {
		473	my ($self, $parent) = @_;
		474
		475	Scalar::Util::weaken ($self->{parent} = $parent);
		476	$self->set_visible if $parent->{visible};
		477	}
		478
		479	sub connect {
		480	my ($self, $signal, $cb) = @_;
		481
		482	push @{ $self->{signal_cb}{$signal} }, $cb;
		483	}
		484
		485	sub _emit {
		486	my ($self, $signal, @args) = @_;
		487
		488	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		489	}
		490
		491	sub emit {
		492	my ($self, $signal, @args) = @_;
		493
		494	$self->_emit ($signal, @args)
		495	|| $self->$signal (@args);
		496	}
		497
		498	sub visibility_change {
		499	#my ($self, $visible) = @_;
		500	}
		501
		502	sub realloc {
		503	my ($self) = @_;
		504
		505	if ($self->{visible}) {
		506	return if $self->{root}{realloc}{$self+0};
		507
		508	$self->{root}{realloc}{$self+0} = $self;
		509	$self->{root}->update;
		510	} else {
		511	delete $self->{req_w};
		512	delete $self->{req_h};
		513	}
		514	}
		515
		516	sub update {
		517	my ($self) = @_;
		518
		519	$self->{parent}->update
		520	if $self->{parent};
		521	}
		522
		523	sub reconfigure {
		524	my ($self) = @_;
		525
		526	$self->realloc;
		527	$self->update;
		528	}
427		529
428	sub draw {	530	sub draw {
429	my ($self) = @_;	531	my ($self) = @_;
430		532
431	return unless $self->{h} && $self->{w};	533	return unless $self->{h} && $self->{w};
…		…
448	glVertex $x , $y + $self->{h};	550	glVertex $x , $y + $self->{h};
449	glEnd;	551	glEnd;
450	glDisable GL_BLEND;	552	glDisable GL_BLEND;
451	}	553	}
452		554
453	if ($ENV{PCLIENT_DEBUG}) {	555	if ($ENV{CFPLUS_DEBUG} & 1) {
454	glPushMatrix;	556	glPushMatrix;
455	glColor 1, 1, 0, 1;	557	glColor 1, 1, 0, 1;
456	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	558	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
457	glBegin GL_LINE_LOOP;	559	glBegin GL_LINE_LOOP;
458	glVertex 0 , 0;	560	glVertex 0 , 0;
…		…
469	my ($self) = @_;	571	my ($self) = @_;
470		572
471	warn "no draw defined for $self\n";	573	warn "no draw defined for $self\n";
472	}	574	}
473		575
474	sub find_widget {
475	my ($self, $x, $y) = @_;
476
477	return () unless $self->{can_events};
478
479	return $self
480	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483	()
484	}
485
486	sub set_parent {
487	my ($self, $parent) = @_;
488
489	Scalar::Util::weaken ($self->{parent} = $parent);
490
491	$self->{root} = $parent->{root};
492	$self->{visible} = $parent->{visible} + 1;
493
494	# TODO: req_w _does_change after ->reconfigure
495	$self->check_size
496	unless exists $self->{req_w};
497
498	$self->show;
499	}
500
501	sub check_size {
502	my ($self, $forced) = @_;
503
504	$self->{force_alloc} = 1 if $forced;
505	$CFClient::UI::ROOT->{check_size}{$self} = $self;
506	}
507
508	sub update {
509	my ($self) = @_;
510
511	$self->{parent}->update
512	if $self->{parent};
513	}
514
515	sub connect {
516	my ($self, $signal, $cb) = @_;
517
518	push @{ $self->{signal_cb}{$signal} }, $cb;
519	}
520
521	sub _emit {
522	my ($self, $signal, @args) = @_;
523
524	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525	}
526
527	sub emit {
528	my ($self, $signal, @args) = @_;
529
530	$self->_emit ($signal, @args)
531	|| $self->$signal (@args);
532	}
533
534	sub DESTROY {	576	sub DESTROY {
535	my ($self) = @_;	577	my ($self) = @_;
536		578
537	delete $WIDGET{$self+0};	579	delete $WIDGET{$self+0};
538	#$self->deactivate;	580	#$self->deactivate;
…		…
594	my ($class, %arg) = @_;	636	my ($class, %arg) = @_;
595	$class->SUPER::new (can_events => 0, %arg);	637	$class->SUPER::new (can_events => 0, %arg);
596	}	638	}
597		639
598	sub size_request {	640	sub size_request {
599	(0, 0)	641	my ($self) = @_;
		642
		643	($self->{w} + 0, $self->{h} + 0)
600	}	644	}
601		645
602	sub draw { }	646	sub draw { }
603		647
604	#############################################################################	648	#############################################################################
…		…
633	$self->{children} = [	677	$self->{children} = [
634	sort { $a->{z} <=> $b->{z} }	678	sort { $a->{z} <=> $b->{z} }
635	@{$self->{children}}, @widgets	679	@{$self->{children}}, @widgets
636	];	680	];
637		681
638	$self->check_size (1);	682	$self->realloc;
639	$self->update;
640	}	683	}
641		684
642	sub children {	685	sub children {
643	@{ $_[0]{children} }	686	@{ $_[0]{children} }
644	}	687	}
…		…
649	delete $child->{parent};	692	delete $child->{parent};
650	$child->hide;	693	$child->hide;
651		694
652	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	695	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653		696
654	$self->check_size (1);	697	$self->realloc;
655	$self->update;
656	}	698	}
657		699
658	sub clear {	700	sub clear {
659	my ($self) = @_;	701	my ($self) = @_;
660		702
…		…
664	for (@$children) {	706	for (@$children) {
665	delete $_->{parent};	707	delete $_->{parent};
666	$_->hide;	708	$_->hide;
667	}	709	}
668		710
669	$self->check_size;	711	$self->realloc;
670	$self->update;
671	}	712	}
672		713
673	sub find_widget {	714	sub find_widget {
674	my ($self, $x, $y) = @_;	715	my ($self, $x, $y) = @_;
675		716
…		…
812	}	853	}
813		854
814	sub size_request {	855	sub size_request {
815	my ($self) = @_;	856	my ($self) = @_;
816		857
817	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	858	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818		859
819	@$self{qw(child_w child_h)}	860	$w = 10 if $self->{scroll_x};
		861	$h = 10 if $self->{scroll_y};
		862
		863	($w, $h)
820	}	864	}
821		865
822	sub size_allocate {	866	sub size_allocate {
823	my ($self, $w, $h) = @_;	867	my ($self, $w, $h) = @_;
824		868
		869	my $child = $self->child;
		870
825	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	871	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	872	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827		873
828	$self->child->configure (0, 0, $w, $h);	874	$self->child->configure (0, 0, $w, $h);
829	$self->update;	875	$self->update;
830	}	876	}
831		877
…		…
974		1020
975	our @ISA = CFClient::UI::Bin::;	1021	our @ISA = CFClient::UI::Bin::;
976		1022
977	use CFClient::OpenGL;	1023	use CFClient::OpenGL;
978		1024
979	my @tex =	1025	my $bg =
		1026	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1027	mipmap => 1, wrap => 1;
		1028
		1029	my @border =
980	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1030	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1031	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982		1032
983	sub new {	1033	sub new {
984	my $class = shift;	1034	my $class = shift;
985
986	# TODO: user_x, user_y, overwrite moveto?
987		1035
988	my $self = $class->SUPER::new (	1036	my $self = $class->SUPER::new (
989	bg => [1, 1, 1, 1],	1037	bg => [1, 1, 1, 1],
990	border_bg => [1, 1, 1, 1],	1038	border_bg => [1, 1, 1, 1],
991	border => 0.6,	1039	border => 0.6,
992	is_toplevel => 1,
993	can_events => 1,	1040	can_events => 1,
		1041	min_w => 16,
		1042	min_h => 16,
994	@_	1043	@_
995	);	1044	);
996		1045
997	$self->{title} &&= new CFClient::UI::Label	1046	$self->{title} &&= new CFClient::UI::Label
998	align => 0,	1047	align => 0,
…		…
1051	my ($ev, $x, $y) = @_;	1100	my ($ev, $x, $y) = @_;
1052		1101
1053	my $dx = $ev->{x} - $ox;	1102	my $dx = $ev->{x} - $ox;
1054	my $dy = $ev->{y} - $oy;	1103	my $dy = $ev->{y} - $oy;
1055		1104
1056	$self->{user_x} = $wx + $dx * $mx;
1057	$self->{user_y} = $wy + $dy * $my;
1058	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1105	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1059	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1106	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1060	$self->move ($self->{user_x}, $self->{user_y});	1107
1061	$self->check_size;	1108	$self->realloc;
		1109	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1062	};	1110	};
1063		1111
1064	} elsif ($lr ^ $td) {	1112	} elsif ($lr ^ $td) {
1065	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1113	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1066	my ($bx, $by) = ($self->{x}, $self->{y});	1114	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1068	$self->{motion} = sub {	1116	$self->{motion} = sub {
1069	my ($ev, $x, $y) = @_;	1117	my ($ev, $x, $y) = @_;
1070		1118
1071	($x, $y) = ($ev->{x}, $ev->{y});	1119	($x, $y) = ($ev->{x}, $ev->{y});
1072		1120
1073	$self->{user_x} = $bx + $x - $ox;	1121	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1074	$self->{user_y} = $by + $y - $oy;
1075	$self->move ($self->{user_x}, $self->{user_y});
1076	$self->update;
1077	};	1122	};
1078	}	1123	}
1079	}	1124	}
1080		1125
1081	sub button_up {	1126	sub button_up {
…		…
1100	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1145	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1101		1146
1102	my $border = $self->border;	1147	my $border = $self->border;
1103		1148
1104	glColor @{ $self->{border_bg} };	1149	glColor @{ $self->{border_bg} };
1105	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1150	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1106	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1151	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1107	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1152	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1108	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1153	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1109		1154
1110	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1155	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1111	my $bg = $tex[0];	1156	glColor @{ $self->{bg} };
1112		1157
1113	# TODO: repeat texture not scale	1158	# TODO: repeat texture not scale
		1159	# solve this better(?)
1114	my $rep_x = $cw / $bg->{w};	1160	$bg->{s} = $cw / $bg->{w};
1115	my $rep_y = $ch / $bg->{h};	1161	$bg->{t} = $ch / $bg->{h};
1116
1117	glColor @{ $self->{bg} };
1118
1119	$bg->{s} = $rep_x;
1120	$bg->{t} = $rep_y;
1121	$bg->{wrap_mode} = 1;
1122	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1162	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123	}	1163	}
1124		1164
1125	glDisable GL_TEXTURE_2D;	1165	glDisable GL_TEXTURE_2D;
1126		1166
…		…
1156	my ($self, $x, $y, $child) = @_;	1196	my ($self, $x, $y, $child) = @_;
1157		1197
1158	$child->set_parent ($self);	1198	$child->set_parent ($self);
1159	$self->{children}[$y][$x] = $child;	1199	$self->{children}[$y][$x] = $child;
1160		1200
1161	$self->check_size (1);	1201	$self->realloc;
1162	}	1202	}
1163		1203
1164	# TODO: move to container class maybe? send children a signal on removal?	1204	# TODO: move to container class maybe? send children a signal on removal?
1165	sub clear {	1205	sub clear {
1166	my ($self) = @_;	1206	my ($self) = @_;
…		…
1171	for (@children) {	1211	for (@children) {
1172	delete $_->{parent};	1212	delete $_->{parent};
1173	$_->hide;	1213	$_->hide;
1174	}	1214	}
1175		1215
1176	$self->check_size (1);	1216	$self->realloc;
1177	$self->update;
1178	}	1217	}
1179		1218
1180	sub get_wh {	1219	sub get_wh {
1181	my ($self) = @_;	1220	my ($self) = @_;
1182		1221
…		…
1278	}	1317	}
1279	}	1318	}
1280		1319
1281	#############################################################################	1320	#############################################################################
1282		1321
1283	package CFClient::UI::HBox;	1322	package CFClient::UI::Box;
1284
1285	# TODO: wrap into common Box base class
1286		1323
1287	our @ISA = CFClient::UI::Container::;	1324	our @ISA = CFClient::UI::Container::;
1288		1325
1289	sub size_request {	1326	sub size_request {
1290	my ($self) = @_;	1327	my ($self) = @_;
1291		1328
1292	my @alloc = map [$_->size_request], @{$self->{children}};	1329	$self->{vertical}
1293		1330	? (
1294	(	1331	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1295	(List::Util::sum map $_->[0], @alloc),	1332	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1296	(List::Util::max map $_->[1], @alloc),	1333	)
1297	)	1334	: (
		1335	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1336	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1337	)
1298	}	1338	}
1299		1339
1300	sub size_allocate {	1340	sub size_allocate {
1301	my ($self, $w, $h) = @_;	1341	my ($self, $w, $h) = @_;
1302		1342
1303	($h, $w) = ($w, $h);	1343	my $space = $self->{vertical} ? $h : $w;
1304
1305	my $children = $self->{children};	1344	my $children = $self->{children};
1306		1345
1307	my @h = map $_->{req_w}, @$children;	1346	my @req;
1308		1347
1309	my $req_h = List::Util::sum @h;	1348	if ($self->{homogeneous}) {
1310		1349	@req = ($space / (@$children || 1)) x @$children;
1311	if ($req_h > $h) {
1312	# ah well, not enough space
1313	$_ *= $h / $req_h for @h;
1314	} else {	1350	} else {
		1351	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1352	my $req = List::Util::sum @req;
		1353
		1354	if ($req > $space) {
		1355	# ah well, not enough space
		1356	$_ *= $space / $req for @req;
		1357	} else {
1315	my $exp = List::Util::sum map $_->{expand}, @$children;	1358	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1316	$exp ||= 1;
1317		1359
		1360	$space = ($space - $req) / $expand; # remaining space to give away
		1361
		1362	$req[$_] += $space * $children->[$_]{expand}
1318	for (0 .. $#$children) {	1363	for 0 .. $#$children;
1319	my $child = $children->[$_];
1320
1321	my $alloc_h = $h[$_];
1322	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1323	$h[$_] = $alloc_h;
1324	}	1364	}
1325	}	1365	}
1326		1366
1327	CFClient::UI::harmonize \@h;	1367	CFClient::UI::harmonize \@req;
1328		1368
1329	my $y = 0;	1369	my $pos = 0;
1330	for (0 .. $#$children) {	1370	for (0 .. $#$children) {
1331	my $child = $children->[$_];
1332	my $h = $h[$_];	1371	my $alloc = $req[$_];
1333	$child->configure ($y, 0, $h, $w);	1372	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1334		1373
1335	$y += $h;	1374	$pos += $alloc;
1336	}	1375	}
1337		1376
1338	1	1377	1
1339	}	1378	}
1340		1379
1341	#############################################################################	1380	#############################################################################
1342		1381
		1382	package CFClient::UI::HBox;
		1383
		1384	our @ISA = CFClient::UI::Box::;
		1385
		1386	sub new {
		1387	my $class = shift;
		1388
		1389	$class->SUPER::new (
		1390	vertical => 0,
		1391	@_,
		1392	)
		1393	}
		1394
		1395	#############################################################################
		1396
1343	package CFClient::UI::VBox;	1397	package CFClient::UI::VBox;
1344		1398
1345	# TODO: wrap into common Box base class
1346
1347	our @ISA = CFClient::UI::Container::;	1399	our @ISA = CFClient::UI::Box::;
1348		1400
1349	sub size_request {	1401	sub new {
1350	my ($self) = @_;	1402	my $class = shift;
1351		1403
1352	my @alloc = map [$_->size_request], @{$self->{children}};	1404	$class->SUPER::new (
1353		1405	vertical => 1,
1354	(	1406	@_,
1355	(List::Util::max map $_->[0], @alloc),
1356	(List::Util::sum map $_->[1], @alloc),
1357	)	1407	)
1358	}
1359
1360	sub size_allocate {
1361	my ($self, $w, $h) = @_;
1362
1363	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1365	my $children = $self->{children};
1366
1367	my @h = map $_->{req_h}, @$children;
1368
1369	my $req_h = List::Util::sum @h;
1370
1371	if ($req_h > $h) {
1372	# ah well, not enough space
1373	$_ *= $h / $req_h for @h;
1374	} else {
1375	my $exp = List::Util::sum map $_->{expand}, @$children;
1376	$exp ||= 1;
1377
1378	for (0 .. $#$children) {
1379	my $child = $children->[$_];
1380
1381	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1382	}
1383	}
1384
1385	CFClient::UI::harmonize \@h;
1386
1387	my $y = 0;
1388	for (0 .. $#$children) {
1389	my $child = $children->[$_];
1390	my $h = $h[$_];
1391	$child->configure (0, $y, $w, $h);
1392
1393	$y += $h;
1394	}
1395
1396	1
1397	}	1408	}
1398		1409
1399	#############################################################################	1410	#############################################################################
1400		1411
1401	package CFClient::UI::Label;	1412	package CFClient::UI::Label;
…		…
1418	ellipsise => 3, # end	1429	ellipsise => 3, # end
1419	layout => (new CFClient::Layout),	1430	layout => (new CFClient::Layout),
1420	fontsize => 1,	1431	fontsize => 1,
1421	align => -1,	1432	align => -1,
1422	valign => -1,	1433	valign => -1,
1423	padding => 2,	1434	padding_x => 2,
		1435	padding_y => 2,
1424	can_events => 0,	1436	can_events => 0,
1425	%arg	1437	%arg
1426	);	1438	);
1427		1439
1428	if (exists $self->{template}) {	1440	if (exists $self->{template}) {
…		…
1464	$self->{text} = "T$text";	1476	$self->{text} = "T$text";
1465		1477
1466	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1478	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1467	$self->{layout}->set_text ($text);	1479	$self->{layout}->set_text ($text);
1468		1480
		1481	$self->realloc;
1469	$self->update;	1482	$self->update;
1470	$self->check_size;
1471	}	1483	}
1472		1484
1473	sub set_markup {	1485	sub set_markup {
1474	my ($self, $markup) = @_;	1486	my ($self, $markup) = @_;
1475		1487
…		…
1479	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1491	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480		1492
1481	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1493	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1482	$self->{layout}->set_markup ($markup);	1494	$self->{layout}->set_markup ($markup);
1483		1495
		1496	$self->realloc;
1484	$self->update;	1497	$self->update;
1485	$self->check_size;
1486	}	1498	}
1487		1499
1488	sub size_request {	1500	sub size_request {
1489	my ($self) = @_;	1501	my ($self) = @_;
1490		1502
…		…
1504		1516
1505	$w = List::Util::max $w, $w2;	1517	$w = List::Util::max $w, $w2;
1506	$h = List::Util::max $h, $h2;	1518	$h = List::Util::max $h, $h2;
1507	}	1519	}
1508		1520
1509	(	1521	($w, $h)
1510	$w + $self->{padding} * 2,
1511	$h + $self->{padding} * 2,
1512	)
1513	}	1522	}
1514		1523
1515	sub size_allocate {	1524	sub size_allocate {
1516	my ($self, $w, $h) = @_;	1525	my ($self, $w, $h) = @_;
1517		1526
1518	delete $self->{texture};	1527	delete $self->{texture}
		1528	;#d#
1519	}	1529	}
1520		1530
1521	sub set_fontsize {	1531	sub set_fontsize {
1522	my ($self, $fontsize) = @_;	1532	my ($self, $fontsize) = @_;
1523		1533
1524	$self->{fontsize} = $fontsize;	1534	$self->{fontsize} = $fontsize;
1525	delete $self->{texture};	1535	delete $self->{texture};
1526		1536
1527	$self->update;	1537	$self->realloc;
1528	$self->check_size;
1529	}	1538	}
1530		1539
1531	sub _draw {	1540	sub _draw {
1532	my ($self) = @_;	1541	my ($self) = @_;
1533		1542
…		…
1541	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1550	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1542	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1551	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543		1552
1544	my $tex = new_from_layout CFClient::Texture $self->{layout};	1553	my $tex = new_from_layout CFClient::Texture $self->{layout};
1545		1554
1546	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1555	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1547	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1556	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1548	: ($self->{w} - $tex->{w}) * 0.5);	1557	: ($self->{w} - $tex->{w}) * 0.5);
1549		1558
1550	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1559	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1551	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1560	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1552	: ($self->{h} - $tex->{h}) * 0.5);	1561	: ($self->{h} - $tex->{h}) * 0.5);
1553		1562
1554	$tex	1563	$tex
1555	};	1564	};
1556		1565
…		…
1613	sub set_text {	1622	sub set_text {
1614	my ($self, $text) = @_;	1623	my ($self, $text) = @_;
1615		1624
1616	$self->{cursor} = length $text;	1625	$self->{cursor} = length $text;
1617	$self->_set_text ($text);	1626	$self->_set_text ($text);
1618	$self->update;	1627
1619	$self->check_size;	1628	$self->realloc;
1620	}	1629	}
1621		1630
1622	sub get_text {	1631	sub get_text {
1623	$_[0]{text}	1632	$_[0]{text}
1624	}	1633	}
…		…
1657	} elsif ($uni) {	1666	} elsif ($uni) {
1658	substr $text, $self->{cursor}++, 0, chr $uni;	1667	substr $text, $self->{cursor}++, 0, chr $uni;
1659	}	1668	}
1660		1669
1661	$self->_set_text ($text);	1670	$self->_set_text ($text);
1662	$self->update;	1671
1663	$self->check_size;	1672	$self->realloc;
1664	}	1673	}
1665		1674
1666	sub focus_in {	1675	sub focus_in {
1667	my ($self) = @_;	1676	my ($self) = @_;
1668		1677
…		…
1795		1804
1796	sub new {	1805	sub new {
1797	my $class = shift;	1806	my $class = shift;
1798		1807
1799	$class->SUPER::new (	1808	$class->SUPER::new (
1800	padding => 4,	1809	padding_x => 4,
		1810	padding_y => 4,
1801	fg => [1, 1, 1],	1811	fg => [1, 1, 1],
1802	active_fg => [0, 0, 1],	1812	active_fg => [0, 0, 1],
1803	can_hover => 1,	1813	can_hover => 1,
1804	align => 0,	1814	align => 0,
1805	valign => 0,	1815	valign => 0,
…		…
1852		1862
1853	sub new {	1863	sub new {
1854	my $class = shift;	1864	my $class = shift;
1855		1865
1856	$class->SUPER::new (	1866	$class->SUPER::new (
1857	padding => 2,	1867	padding_x => 2,
		1868	padding_y => 2,
1858	fg => [1, 1, 1],	1869	fg => [1, 1, 1],
1859	active_fg => [1, 1, 0],	1870	active_fg => [1, 1, 0],
1860	bg => [0, 0, 0, 0.2],	1871	bg => [0, 0, 0, 0.2],
1861	active_bg => [1, 1, 1, 0.5],	1872	active_bg => [1, 1, 1, 0.5],
1862	state => 0,	1873	state => 0,
…		…
1866	}	1877	}
1867		1878
1868	sub size_request {	1879	sub size_request {
1869	my ($self) = @_;	1880	my ($self) = @_;
1870		1881
1871	($self->{padding} * 2 + 6) x 2	1882	(6) x 2
1872	}	1883	}
1873		1884
1874	sub button_down {	1885	sub button_down {
1875	my ($self, $ev, $x, $y) = @_;	1886	my ($self, $ev, $x, $y) = @_;
1876		1887
1877	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1888	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1878	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1889	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1879	$self->{state} = !$self->{state};	1890	$self->{state} = !$self->{state};
1880	$self->_emit (changed => $self->{state});	1891	$self->_emit (changed => $self->{state});
1881	}	1892	}
1882	}	1893	}
1883		1894
1884	sub _draw {	1895	sub _draw {
1885	my ($self) = @_;	1896	my ($self) = @_;
1886		1897
1887	$self->SUPER::_draw;	1898	$self->SUPER::_draw;
1888		1899
1889	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1900	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1890		1901
1891	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1902	my ($w, $h) = @$self{qw(w h)};
		1903
		1904	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1892		1905
1893	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1906	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1894		1907
1895	my $tex = $self->{state} ? $tex[1] : $tex[0];	1908	my $tex = $self->{state} ? $tex[1] : $tex[0];
1896		1909
…		…
2161	fg => [1, 1, 1],	2174	fg => [1, 1, 1],
2162	active_fg => [0, 0, 0],	2175	active_fg => [0, 0, 0],
2163	bg => [0, 0, 0, 0.2],	2176	bg => [0, 0, 0, 0.2],
2164	active_bg => [1, 1, 1, 0.5],	2177	active_bg => [1, 1, 1, 0.5],
2165	range => [0, 0, 100, 10, 0],	2178	range => [0, 0, 100, 10, 0],
2166	req_w => $::WIDTH / 80,	2179	min_w => $::WIDTH / 80,
2167	req_h => $::WIDTH / 80,	2180	min_h => $::WIDTH / 80,
2168	vertical => 0,	2181	vertical => 0,
2169	can_hover => 1,	2182	can_hover => 1,
2170	inner_pad => 0.02,	2183	inner_pad => 0.02,
2171	@_	2184	@_
2172	);	2185	);
…		…
2175	$self->update;	2188	$self->update;
2176		2189
2177	$self	2190	$self
2178	}	2191	}
2179		2192
		2193	sub changed { }
		2194
2180	sub set_range {	2195	sub set_range {
2181	my ($self, $range) = @_;	2196	my ($self, $range) = @_;
2182		2197
2183	($range, $self->{range}) = ($self->{range}, $range);	2198	($range, $self->{range}) = ($self->{range}, $range);
2184		2199
…		…
2210	}	2225	}
2211		2226
2212	sub size_request {	2227	sub size_request {
2213	my ($self) = @_;	2228	my ($self) = @_;
2214		2229
2215	my $w = $self->{req_w};	2230	($self->{req_w}, $self->{req_h})
2216	my $h = $self->{req_h};
2217
2218	$self->{vertical} ? ($h, $w) : ($w, $h)
2219	}	2231	}
2220		2232
2221	sub button_down {	2233	sub button_down {
2222	my ($self, $ev, $x, $y) = @_;	2234	my ($self, $ev, $x, $y) = @_;
2223		2235
…		…
2579	state => 0,	2591	state => 0,
2580	on_activate => \&toggle_flopper,	2592	on_activate => \&toggle_flopper,
2581	@_	2593	@_
2582	);	2594	);
2583		2595
2584	if ($self->{state}) {
2585	$self->{state} = 0;
2586	$self->toggle_flopper;
2587	}
2588
2589	$self	2596	$self
2590	}	2597	}
2591		2598
2592	sub toggle_flopper {	2599	sub toggle_flopper {
2593	my ($self) = @_;	2600	my ($self) = @_;
2594		2601
2595	# TODO: use animation	2602	$self->{other}->toggle_visibility;
2596	if ($self->{state} = !$self->{state}) {
2597	$CFClient::UI::ROOT->add ($self->{other});
2598	$self->{other}->move ($self->coord2global (0, $self->{h}));
2599	$self->_emit ("open");
2600	} else {
2601	$CFClient::UI::ROOT->remove ($self->{other});
2602	$self->_emit ("close");
2603	}
2604
2605	$self->_emit (changed => $self->{state});
2606	}	2603	}
2607		2604
2608	#############################################################################	2605	#############################################################################
2609		2606
2610	package CFClient::UI::Tooltip;	2607	package CFClient::UI::Tooltip;
…		…
2623	}	2620	}
2624		2621
2625	sub set_tooltip_from {	2622	sub set_tooltip_from {
2626	my ($self, $widget) = @_;	2623	my ($self, $widget) = @_;
2627		2624
		2625	my $tooltip = $widget->{tooltip};
		2626
		2627	if ($ENV{CFPLUS_DEBUG} & 2) {
		2628	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2629	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2630	. "req $widget->{req_w} $widget->{req_h}\n"
		2631	. "visible $widget->{visible}";
		2632	}
		2633
2628	$self->add (new CFClient::UI::Label	2634	$self->add (new CFClient::UI::Label
2629	markup => $widget->{tooltip},	2635	markup => $tooltip,
2630	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2636	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631	fontsize => 0.8,	2637	fontsize => 0.8,
2632	fg => [0, 0, 0, 1],	2638	fg => [0, 0, 0, 1],
2633	ellipsise => 0,	2639	ellipsise => 0,
2634	font => ($widget->{tooltip_font} || $::FONT_PROP),	2640	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2645		2651
2646	sub size_allocate {	2652	sub size_allocate {
2647	my ($self, $w, $h) = @_;	2653	my ($self, $w, $h) = @_;
2648		2654
2649	$self->SUPER::size_allocate ($w - 4, $h - 4);	2655	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2656	}
		2657
		2658	sub visibility_change {
		2659	my ($self, $visible) = @_;
		2660
		2661	return unless $visible;
		2662
		2663	$self->{root}->on_post_alloc ("move_$self" => sub {
		2664	my $widget = $self->{owner}
		2665	or return;
		2666
		2667	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2668
		2669	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2670	if $x + $self->{w} > $::WIDTH;
		2671
		2672	$self->move_abs ($x, $y);
		2673	});
2650	}	2674	}
2651		2675
2652	sub _draw {	2676	sub _draw {
2653	my ($self) = @_;	2677	my ($self) = @_;
2654		2678
…		…
2671	glVertex $w, $h;	2695	glVertex $w, $h;
2672	glVertex $w, 0;	2696	glVertex $w, 0;
2673	glEnd;	2697	glEnd;
2674		2698
2675	glTranslate 2 - 0.375, 2 - 0.375;	2699	glTranslate 2 - 0.375, 2 - 0.375;
		2700
2676	$self->SUPER::_draw;	2701	$self->SUPER::_draw;
2677	}	2702	}
2678		2703
2679	#############################################################################	2704	#############################################################################
2680		2705
…		…
2756	$self->SUPER::DESTROY;	2781	$self->SUPER::DESTROY;
2757	}	2782	}
2758		2783
2759	#############################################################################	2784	#############################################################################
2760		2785
2761	package CFClient::UI::Inventory;
2762
2763	our @ISA = CFClient::UI::ScrolledWindow::;
2764
2765	sub new {
2766	my $class = shift;
2767
2768	my $self = $class->SUPER::new (
2769	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770	@_,
2771	);
2772
2773	$self
2774	}
2775
2776	sub set_items {
2777	my ($self, $items) = @_;
2778
2779	$self->{scrolled}->clear;
2780	return unless $items;
2781
2782	my @items = sort {
2783	($a->{type} <=> $b->{type})
2784	or ($a->{name} cmp $b->{name})
2785	} @$items;
2786
2787	$self->{real_items} = \@items;
2788
2789	my $row = 0;
2790	for my $item (@items) {
2791	CFClient::Item::update_widgets $item;
2792
2793	$self->{scrolled}->add (0, $row, $item->{face_widget});
2794	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2795	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2796
2797	$row++;
2798	}
2799	}
2800
2801	sub size_request {
2802	my ($self) = @_;
2803	($self->{req_w}, $self->{req_h});
2804	}
2805
2806	#############################################################################
2807
2808	package CFClient::UI::Menu;	2786	package CFClient::UI::Menu;
2809		2787
2810	our @ISA = CFClient::UI::FancyFrame::;	2788	our @ISA = CFClient::UI::FancyFrame::;
2811		2789
2812	use CFClient::OpenGL;	2790	use CFClient::OpenGL;
…		…
2850	# maybe save $GRAB? must be careful about events...	2828	# maybe save $GRAB? must be careful about events...
2851	$GRAB = $self;	2829	$GRAB = $self;
2852	$self->{button} = $ev->{button};	2830	$self->{button} = $ev->{button};
2853		2831
2854	$self->show;	2832	$self->show;
2855	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2833	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2856	}	2834	}
2857		2835
2858	sub mouse_motion {	2836	sub mouse_motion {
2859	my ($self, $ev, $x, $y) = @_;	2837	my ($self, $ev, $x, $y) = @_;
2860		2838
…		…
2985	$self->SUPER::reconfigure;	2963	$self->SUPER::reconfigure;
2986	}	2964	}
2987		2965
2988	#############################################################################	2966	#############################################################################
2989		2967
2990	package CFClient::UI::Root;	2968	package CFClient::UI::Inventory;
2991		2969
2992	our @ISA = CFClient::UI::Container::;	2970	our @ISA = CFClient::UI::ScrolledWindow::;
2993
2994	use CFClient::OpenGL;
2995		2971
2996	sub new {	2972	sub new {
2997	my $class = shift;	2973	my $class = shift;
2998		2974
2999	$class->SUPER::new (	2975	my $self = $class->SUPER::new (
		2976	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		2977	@_,
		2978	);
		2979
		2980	$self
		2981	}
		2982
		2983	sub set_items {
		2984	my ($self, $items) = @_;
		2985
		2986	$self->{scrolled}->clear;
		2987	return unless $items;
		2988
		2989	my @items = sort {
		2990	($a->{type} <=> $b->{type})
		2991	or ($a->{name} cmp $b->{name})
		2992	} @$items;
		2993
		2994	$self->{real_items} = \@items;
		2995
		2996	my $row = 0;
		2997	for my $item (@items) {
		2998	CFClient::Item::update_widgets $item;
		2999
		3000	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3001	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3002	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3003
		3004	$row++;
		3005	}
		3006	}
		3007
		3008	#############################################################################
		3009
		3010	package CFClient::UI::BindEditor;
		3011
		3012	our @ISA = CFClient::UI::FancyFrame::;
		3013
		3014	sub new {
		3015	my $class = shift;
		3016
		3017	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3018
		3019	$self->add (my $vb = new CFClient::UI::VBox);
		3020
		3021
		3022	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3023	text => "start recording",
		3024	tooltip => "Start/Stops recording of actions."
		3025	."All subsequent actions after the recording started will be captured."
		3026	."The actions are displayed after the record was stopped."
		3027	."To bind the action you have to click on the 'Bind' button",
		3028	on_activate => sub {
		3029	unless ($self->{recording}) {
		3030	$self->start;
		3031	} else {
		3032	$self->stop;
		3033	}
		3034	});
		3035
		3036	$vb->add (new CFClient::UI::Label text => "Actions:");
		3037	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3038
		3039	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3040	$vb->add (my $hb = new CFClient::UI::HBox);
		3041	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3042	$hb->add (new CFClient::UI::Button
		3043	text => "bind",
		3044	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3045	on_activate => sub {
		3046	$self->ask_for_bind;
		3047	});
		3048
		3049	$vb->add (my $hb = new CFClient::UI::HBox);
		3050	$hb->add (new CFClient::UI::Button
		3051	text => "ok",
		3052	expand => 1,
		3053	tooltip => "This closes the binding editor and saves the binding",
		3054	on_activate => sub {
		3055	$self->hide;
		3056	$self->commit;
		3057	});
		3058
		3059	$hb->add (new CFClient::UI::Button
		3060	text => "cancel",
		3061	expand => 1,
		3062	tooltip => "This closes the binding editor without saving",
		3063	on_activate => sub {
		3064	$self->hide;
		3065	$self->{binding_cancel}->()
		3066	if $self->{binding_cancel};
		3067	});
		3068
		3069	$self->update_binding_widgets;
		3070
		3071	$self
		3072	}
		3073
		3074	sub commit {
		3075	my ($self) = @_;
		3076	my ($mod, $sym, $cmds) = $self->get_binding;
		3077	if ($sym != 0 && @$cmds > 0) {
		3078	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3079	."'. Don't forget 'Save Config'!");
		3080	$self->{binding_change}->($mod, $sym, $cmds)
		3081	if $self->{binding_change};
		3082	} else {
		3083	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3084	$self->{binding_cancel}->()
		3085	if $self->{binding_cancel};
		3086	}
		3087	}
		3088
		3089	sub start {
		3090	my ($self) = @_;
		3091
		3092	$self->{rec_btn}->set_text ("stop recording");
		3093	$self->{recording} = 1;
		3094	$self->clear_command_list;
		3095	$::CONN->start_record if $::CONN;
		3096	}
		3097
		3098	sub stop {
		3099	my ($self) = @_;
		3100
		3101	$self->{rec_btn}->set_text ("start recording");
		3102	$self->{recording} = 0;
		3103
		3104	my $rec;
		3105	$rec = $::CONN->stop_record if $::CONN;
		3106	return unless ref $rec eq 'ARRAY';
		3107	$self->set_command_list ($rec);
		3108	}
		3109
		3110	# if $commit is true, the binding will be set after the user entered a key combo
		3111	sub ask_for_bind {
		3112	my ($self, $commit) = @_;
		3113
		3114	CFClient::Binder::open_binding_dialog (sub {
		3115	my ($mod, $sym) = @_;
		3116	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3117	$self->update_binding_widgets;
		3118	$self->commit if $commit;
		3119	});
		3120	}
		3121
		3122	# $mod and $sym are the modifiers and key symbol
		3123	# $cmds is a array ref of strings (the commands)
		3124	# $cb is the callback that is executed on OK
		3125	# $ccb is the callback that is executed on CANCEL and
		3126	# when the binding was unsuccessful on OK
		3127	sub set_binding {
		3128	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3129
		3130	$self->clear_command_list;
		3131	$self->{recording} = 0;
		3132	$self->{rec_btn}->set_text ("start recording");
		3133
		3134	$self->{binding} = [$mod, $sym];
		3135	$self->{commands} = $cmds;
		3136
		3137	$self->{binding_change} = $cb;
		3138	$self->{binding_cancel} = $ccb;
		3139
		3140	$self->update_binding_widgets;
		3141	}
		3142
		3143	# this is a shortcut method that asks for a binding
		3144	# and then just binds it.
		3145	sub do_quick_binding {
		3146	my ($self, $cmds) = @_;
		3147	$self->set_binding (undef, undef, $cmds, sub {
		3148	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3149	});
		3150	$self->ask_for_bind (1);
		3151	}
		3152
		3153	sub update_binding_widgets {
		3154	my ($self) = @_;
		3155	my ($mod, $sym, $cmds) = $self->get_binding;
		3156	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3157	$self->set_command_list ($cmds);
		3158	}
		3159
		3160	sub get_binding {
		3161	my ($self) = @_;
		3162	return (
		3163	$self->{binding}->[0],
		3164	$self->{binding}->[1],
		3165	[ grep { defined $_ } @{$self->{commands}} ]
		3166	);
		3167	}
		3168
		3169	sub clear_command_list {
		3170	my ($self) = @_;
		3171	$self->{cmdbox}->clear ();
		3172	}
		3173
		3174	sub set_command_list {
		3175	my ($self, $cmds) = @_;
		3176
		3177	$self->{cmdbox}->clear ();
		3178	$self->{commands} = $cmds;
		3179
		3180	my $idx = 0;
		3181
		3182	for (@$cmds) {
		3183	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3184
		3185	my $i = $idx;
		3186	$hb->add (new CFClient::UI::Label text => $_);
		3187	$hb->add (new CFClient::UI::Button
		3188	text => "delete",
		3189	tooltip => "Deletes the action from the record",
		3190	on_activate => sub {
		3191	$self->{cmdbox}->remove ($hb);
		3192	$cmds->[$i] = undef;
		3193	});
		3194
		3195
		3196	$idx++
		3197	}
		3198	}
		3199
		3200	#############################################################################
		3201
		3202	package CFClient::UI::SpellList;
		3203
		3204	our @ISA = CFClient::UI::FancyFrame::;
		3205
		3206	sub new {
		3207	my $class = shift;
		3208
		3209	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3210
		3211	$self->add (new CFClient::UI::ScrolledWindow
		3212	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3213
		3214	$self;
		3215	}
		3216
		3217	# XXX: Do sorting? Argl...
		3218	sub add_spell {
		3219	my ($self, $spell) = @_;
		3220	$self->{spells}->{$spell->{name}} = $spell;
		3221
		3222	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3223	face => $spell->{face},
		3224	can_hover => 1,
		3225	can_events => 1,
		3226	tooltip => $spell->{message});
		3227
		3228	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3229	text => $spell->{name},
		3230	can_hover => 1,
		3231	can_events => 1,
		3232	tooltip => $spell->{message},
		3233	expand => 1);
		3234
		3235	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3236	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3237	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3238	expand => 1);
		3239
		3240	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3241	text => "bind to key",
		3242	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3243	}
		3244
		3245	sub rebuild_spell_list {
		3246	my ($self) = @_;
		3247	$self->{tbl_idx} = 0;
		3248	$self->add_spell ($_) for values %{$self->{spells}};
		3249	}
		3250
		3251	sub remove_spell {
		3252	my ($self, $spell) = @_;
		3253	delete $self->{spells}->{$spell->{name}};
		3254	$self->rebuild_spell_list;
		3255	}
		3256
		3257	#############################################################################
		3258
		3259	package CFClient::UI::Root;
		3260
		3261	our @ISA = CFClient::UI::Container::;
		3262
		3263	use CFClient::OpenGL;
		3264
		3265	sub new {
		3266	my $class = shift;
		3267
		3268	my $self = $class->SUPER::new (
3000	visible => 1,	3269	visible => 1,
3001	@_,	3270	@_,
3002	)	3271	);
3003	}
3004		3272
3005	sub configure {	3273	Scalar::Util::weaken ($self->{root} = $self);
3006	my ($self, $x, $y, $w, $h) = @_;
3007		3274
3008	$self->{w} = $w;	3275	$self
3009	$self->{h} = $h;
3010	}
3011
3012	sub check_size {
3013	my ($self) = @_;
3014
3015	$self->size_allocate ($self->{w}, $self->{h})
3016	if $self->{w};
3017	}	3276	}
3018		3277
3019	sub size_request {	3278	sub size_request {
3020	my ($self) = @_;	3279	my ($self) = @_;
3021		3280
3022	($self->{w}, $self->{h})	3281	($self->{w}, $self->{h})
		3282	}
		3283
		3284	sub _to_pixel {
		3285	my ($coord, $size, $max) = @_;
		3286
		3287	$coord =
		3288	$coord eq "center" ? ($max - $size) * 0.5
		3289	: $coord eq "max" ? $max
		3290	: $coord;
		3291
		3292	$coord = 0 if $coord < 0;
		3293	$coord = $max - $size if $coord > $max - $size;
		3294
		3295	int $coord + 0.5
3023	}	3296	}
3024		3297
3025	sub size_allocate {	3298	sub size_allocate {
3026	my ($self, $w, $h) = @_;	3299	my ($self, $w, $h) = @_;
3027		3300
3028	for my $child ($self->children) {	3301	for my $child ($self->children) {
3029	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3302	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3030		3303
3031	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3304	$X = $child->{force_x} if exists $child->{force_x};
3032	if exists $child->{req_x};	3305	$Y = $child->{force_y} if exists $child->{force_y};
3033		3306
3034	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3307	$X = _to_pixel $X, $W, $self->{w};
3035	if exists $child->{req_y};	3308	$Y = _to_pixel $Y, $H, $self->{h};
3036
3037	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039		3309
3040	$child->configure ($X, $Y, $W, $H);	3310	$child->configure ($X, $Y, $W, $H);
3041	}	3311	}
3042	}	3312	}
3043		3313
…		…
3054	}	3324	}
3055		3325
3056	sub update {	3326	sub update {
3057	my ($self) = @_;	3327	my ($self) = @_;
3058		3328
3059	$self->check_size;
3060	$::WANT_REFRESH++;	3329	$::WANT_REFRESH++;
3061	}	3330	}
3062		3331
3063	sub add {	3332	sub add {
3064	my ($self, @children) = @_;	3333	my ($self, @children) = @_;
3065		3334
3066	for (my @widgets = @children; my $w = pop @widgets; ) {
3067	push @widgets, $w->children;
3068	$w->{root} = $self;
3069	$w->{visible} = $self->{visible} + 1;
3070	}
3071
3072	for my $child (@children) {
3073	$child->{is_toplevel} = 1;	3335	$_->{is_toplevel} = 1
3074		3336	for @children;
3075	# integerise window positions
3076	$child->{x} = int $child->{x};
3077	$child->{y} = int $child->{y};
3078	}
3079		3337
3080	$self->SUPER::add (@children);	3338	$self->SUPER::add (@children);
3081	}	3339	}
3082		3340
3083	sub remove {	3341	sub remove {
3084	my ($self, @children) = @_;	3342	my ($self, @children) = @_;
3085		3343
3086	$self->SUPER::remove (@children);	3344	$self->SUPER::remove (@children);
		3345
		3346	delete $self->{is_toplevel}
		3347	for @children;
3087		3348
3088	while (@children) {	3349	while (@children) {
3089	my $w = pop @children;	3350	my $w = pop @children;
3090	push @children, $w->children;	3351	push @children, $w->children;
3091	$w->set_invisible;	3352	$w->set_invisible;
…		…
3110	while ($self->{refresh_hook}) {	3371	while ($self->{refresh_hook}) {
3111	$_->()	3372	$_->()
3112	for values %{delete $self->{refresh_hook}};	3373	for values %{delete $self->{refresh_hook}};
3113	}	3374	}
3114		3375
3115	if ($self->{check_size}) {	3376	if ($self->{realloc}) {
3116	my @queue;	3377	my @queue;
3117		3378
3118	for (;;) {	3379	while () {
3119	if ($self->{check_size}) {	3380	if ($self->{realloc}) {
3120	#TODO use array-of-depth approach	3381	#TODO use array-of-depth approach
3121		3382
		3383	use sort 'stable';
		3384
3122	@queue = sort { $a->{visible} <=> $b->{visible} }	3385	@queue = sort { $a->{visible} <=> $b->{visible} }
3123	@queue, values %{delete $self->{check_size}};	3386	@queue, values %{delete $self->{realloc}};
3124	}	3387	}
3125		3388
3126	my $widget = pop @queue || last;	3389	my $widget = pop @queue || last;
3127		3390
3128	defined $widget->{visible} or last; # do not resize invisible widgets	3391	$widget->{visible} or last; # do not resize invisible widgets
3129		3392
3130	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3131	? @$widget{qw(user_w user_h)}
3132	: $widget->size_request;	3393	my ($w, $h) = $widget->size_request;
3133		3394
		3395	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3396	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3397
		3398	$w = $widget->{force_w} if exists $widget->{force_w};
		3399	$h = $widget->{force_h} if exists $widget->{force_h};
		3400
		3401	if ($widget->{req_w} != $w || $widget->{req_h} != $h
3134	if (delete $widget->{force_alloc}	3402	|| delete $widget->{force_realloc}) {
3135	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3136	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3137
3138	$widget->{req_w} = $w;	3403	$widget->{req_w} = $w;
3139	$widget->{req_h} = $h;	3404	$widget->{req_h} = $h;
3140		3405
3141	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3406	$self->{size_alloc}{$widget+0} = $widget;
3142		3407
3143	$widget->{parent}->check_size
3144	if $widget->{parent};	3408	if (my $parent = $widget->{parent}) {
		3409	$self->{realloc}{$parent+0} = $parent;
		3410	#unshift @queue, $parent;
		3411	$parent->{force_size_alloc} = 1;
		3412	$self->{size_alloc}{$parent+0} = $parent;
		3413	}
3145	}	3414	}
		3415
		3416	delete $self->{realloc}{$widget+0};
3146	}	3417	}
3147	}	3418	}
3148		3419
3149	while ($self->{size_alloc}) {	3420	while (my $size_alloc = delete $self->{size_alloc}) {
3150	for (values %{delete $self->{size_alloc}}) {	3421	my @queue = sort { $b->{visible} <=> $a->{visible} }
3151	my ($widget, $w, $h) = @$_;	3422	values %$size_alloc;
		3423
		3424	while () {
		3425	my $widget = pop @queue || last;
		3426
		3427	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3152		3428
3153	$w = 0 if $w < 0;	3429	$w = 0 if $w < 0;
3154	$h = 0 if $h < 0;	3430	$h = 0 if $h < 0;
3155		3431
		3432	$w = int $w + 0.5;
		3433	$h = int $h + 0.5;
		3434
		3435	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3156	$widget->{w} = $w;	3436	$widget->{w} = $w;
3157	$widget->{h} = $h;	3437	$widget->{h} = $h;
		3438
3158	$widget->emit (size_allocate => $w, $h);	3439	$widget->emit (size_allocate => $w, $h);
		3440	}
3159	}	3441	}
3160	}	3442	}
3161		3443
3162	while ($self->{post_alloc_hook}) {	3444	while ($self->{post_alloc_hook}) {
3163	$_->()	3445	$_->()
3164	for values %{delete $self->{post_alloc_hook}};	3446	for values %{delete $self->{post_alloc_hook}};
3165	}	3447	}
		3448
3166		3449
3167	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3450	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3168	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3451	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3169	glClear GL_COLOR_BUFFER_BIT;	3452	glClear GL_COLOR_BUFFER_BIT;
3170		3453

Diff Legend

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