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.247 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.270 by elmex, Fri Jun 2 09:02:49 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 {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
40	if (!$GRAB) {	47	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
45	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
46		54
47	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
48		56
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		58
51	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	60	$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	}	61	}
63		62
64	return;	63	return;
65	}	64	}
66	}	65	}
…		…
172	sub rescale_widgets {	171	sub rescale_widgets {
173	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
174		173
175	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
176	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$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};	180	$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};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
		185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
183	}	189	}
184	}	190	}
185		191
186	reconfigure_widgets;	192	reconfigure_widgets;
187	}	193	}
…		…
196		202
197	sub new {	203	sub new {
198	my $class = shift;	204	my $class = shift;
199		205
200	my $self = bless {	206	my $self = bless {
201	x => 0,	207	x => "center",
202	y => 0,	208	y => "center",
203	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
204	can_events => 1,	212	can_events => 1,
205	@_	213	@_
206	}, $class;	214	}, $class;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207		217
208	for (keys %$self) {	218	for (keys %$self) {
209	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
210	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
211	}	221	}
212	}	222	}
213		223
214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217	$self->{req_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218	$self->{req_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
221	}	234	}
222		235
223	$self	236	$self
224	}
225
226	sub toggle_visibility {
227	my ($self) = @_;
228
229	if ($self->{visible}) {
230	$self->hide;
231	} else {
232	$self->show;
233	}
234	}	237	}
235		238
236	sub destroy {	239	sub destroy {
237	my ($self) = @_;	240	my ($self) = @_;
238		241
…		…
240	%$self = ();	243	%$self = ();
241	}	244	}
242		245
243	sub show {	246	sub show {
244	my ($self) = @_;	247	my ($self) = @_;
		248
245	return if $self->{parent};	249	return if $self->{parent};
246		250
247	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
248	}
249
250	sub center {
251	my ($self) = @_;
252
253	$CFClient::UI::ROOT->on_post_alloc (
254	"center_$self" => sub {
255	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
256	},
257	);
258
259	$self->update;
260	}	252	}
261		253
262	sub set_visible {	254	sub set_visible {
263	my ($self) = @_;	255	my ($self) = @_;
264		256
265	return if $self->{visible};	257	return if $self->{visible};
266		258
267	$self->{root} = $self->{parent}{root};	259	$self->{root} = $self->{parent}{root};
268	$self->{visible} = $self->{parent}{visible} + 1;	260	$self->{visible} = $self->{parent}{visible} + 1;
269		261
270	$self->emit (visibility_change => 1)	262	$self->emit (visibility_change => 1);
		263
		264	$self->realloc if !exists $self->{req_w};
		265
		266	$_->set_visible for $self->children;
271	}	267	}
272		268
273	sub set_invisible {	269	sub set_invisible {
274	my ($self) = @_;	270	my ($self) = @_;
275		271
276	return unless $self->{visible};	272	return unless $self->{visible};
277		273
278	# broken show/hide model	274	$_->set_invisible for $self->children;
279		275
280	delete $self->{root};	276	delete $self->{root};
281	delete $self->{visible};	277	delete $self->{visible};
282		278
283	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
284	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
285		281
286	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
287	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
288		284
289	$self->focus_out;	285	$self->focus_out;
290		286
291	$self->emit (visibility_change => 0);	287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
292	}	305	}
293		306
294	sub hide {	307	sub hide {
295	my ($self) = @_;	308	my ($self) = @_;
296		309
…		…
298		311
299	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
300	if $self->{parent};	313	if $self->{parent};
301	}	314	}
302		315
303	sub move {	316	sub move_abs {
304	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
305		318
306	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
307	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
308	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
309		322
310	$self->update;	323	$self->update;
311	}	324	}
312		325
313	sub set_size {	326	sub set_size {
314	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
315		328
316	$self->{def_w} = $w;	329	$self->{force_w} = $w;
317	$self->{def_h} = $h;	330	$self->{force_h} = $h;
318		331
319	$self->check_size;	332	$self->realloc;
320	}	333	}
321		334
322	sub size_request {	335	sub size_request {
323	require Carp;	336	require Carp;
324	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
326		339
327	sub configure {	340	sub configure {
328	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
329		342
330	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
331	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
332	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
333		348
334	# use alignment to adjust x, y	349	# use alignment to adjust x, y
335		350
336	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
337	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
338
339	($w, $h) = ($w2, $h2);
340	}	353	}
341		354
342	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
343	$self->{x} = $x;	356	$self->{x} = $x;
344	$self->{y} = $y;	357	$self->{y} = $y;
345	$self->update;	358	$self->update;
346	}	359	}
347		360
348	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
349	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
350	}	368	}
351	}	369	}
352		370
353	sub size_allocate {	371	sub size_allocate {
354	# nothing to be done	372	# nothing to be done
355	}
356
357	sub reconfigure {
358	my ($self) = @_;
359
360	$self->check_size (1);
361	$self->update;
362	}	373	}
363		374
364	sub children {	375	sub children {
365	}	376	}
366		377
…		…
439	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
440		451
441	$self->focus_in;	452	$self->focus_in;
442	}	453	}
443		454
444	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub find_widget {
445	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	my ($self, $x, $y) = @_;
446	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457
447	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	return () unless $self->{can_events};
448	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	459
		460	return $self
		461	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		462	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		463
		464	()
		465	}
		466
		467	sub set_parent {
		468	my ($self, $parent) = @_;
		469
		470	Scalar::Util::weaken ($self->{parent} = $parent);
		471	$self->set_visible if $parent->{visible};
		472	}
		473
		474	sub connect {
		475	my ($self, $signal, $cb) = @_;
		476
		477	push @{ $self->{signal_cb}{$signal} }, $cb;
		478	}
		479
		480	sub _emit {
		481	my ($self, $signal, @args) = @_;
		482
		483	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		484	}
		485
		486	sub emit {
		487	my ($self, $signal, @args) = @_;
		488
		489	$self->_emit ($signal, @args)
		490	|| $self->$signal (@args);
		491	}
		492
		493	sub visibility_change {
		494	#my ($self, $visible) = @_;
		495	}
		496
		497	sub realloc {
		498	my ($self) = @_;
		499
		500	if ($self->{visible}) {
		501	return if $self->{root}{realloc}{$self+0};
		502
		503	$self->{root}{realloc}{$self+0} = $self;
		504	$self->{root}->update;
		505	} else {
		506	delete $self->{req_w};
		507	delete $self->{req_h};
		508	}
		509	}
		510
		511	sub update {
		512	my ($self) = @_;
		513
		514	$self->{parent}->update
		515	if $self->{parent};
		516	}
		517
		518	sub reconfigure {
		519	my ($self) = @_;
		520
		521	$self->realloc;
		522	$self->update;
		523	}
		524
		525	# using global variables seems a bit hacky, but passing through all drawing
		526	# functions seems pointless.
		527	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
449		528
450	sub draw {	529	sub draw {
451	my ($self) = @_;	530	my ($self) = @_;
452		531
453	return unless $self->{h} && $self->{w};	532	return unless $self->{h} && $self->{w};
		533
		534	# update screen rectangle
		535	local $draw_x = $draw_x + $self->{x};
		536	local $draw_y = $draw_y + $self->{y};
		537	local $draw_w = $draw_x + $self->{w};
		538	local $draw_h = $draw_y + $self->{h};
		539
		540	# skip widgets that are entirely outside the drawing area
		541	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		542	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
454		543
455	glPushMatrix;	544	glPushMatrix;
456	glTranslate $self->{x}, $self->{y}, 0;	545	glTranslate $self->{x}, $self->{y}, 0;
457	$self->_draw;	546	$self->_draw;
458	glPopMatrix;	547	glPopMatrix;
…		…
470	glVertex $x , $y + $self->{h};	559	glVertex $x , $y + $self->{h};
471	glEnd;	560	glEnd;
472	glDisable GL_BLEND;	561	glDisable GL_BLEND;
473	}	562	}
474		563
475	if ($ENV{PCLIENT_DEBUG}) {	564	if ($ENV{CFPLUS_DEBUG} & 1) {
476	glPushMatrix;	565	glPushMatrix;
477	glColor 1, 1, 0, 1;	566	glColor 1, 1, 0, 1;
478	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
479	glBegin GL_LINE_LOOP;	568	glBegin GL_LINE_LOOP;
480	glVertex 0 , 0;	569	glVertex 0 , 0;
…		…
491	my ($self) = @_;	580	my ($self) = @_;
492		581
493	warn "no draw defined for $self\n";	582	warn "no draw defined for $self\n";
494	}	583	}
495		584
496	sub find_widget {
497	my ($self, $x, $y) = @_;
498
499	return () unless $self->{can_events};
500
501	return $self
502	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
503	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
504
505	()
506	}
507
508	sub set_parent {
509	my ($self, $parent) = @_;
510
511	Scalar::Util::weaken ($self->{parent} = $parent);
512
513	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
514
515	$self->check_size;
516	}
517
518	sub check_size {
519	my ($self, $forced) = @_;
520
521	$self->{force_alloc} = 1 if $forced;
522	$CFClient::UI::ROOT->{check_size}{$self} = $self;
523	}
524
525	sub update {
526	my ($self) = @_;
527
528	$self->{parent}->update
529	if $self->{parent};
530	}
531
532	sub connect {
533	my ($self, $signal, $cb) = @_;
534
535	push @{ $self->{signal_cb}{$signal} }, $cb;
536	}
537
538	sub _emit {
539	my ($self, $signal, @args) = @_;
540
541	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
542	}
543
544	sub emit {
545	my ($self, $signal, @args) = @_;
546
547	$self->_emit ($signal, @args)
548	|| $self->$signal (@args);
549	}
550
551	sub visibility_change {
552	#my ($self, $visible) = @_;
553	}
554
555	sub DESTROY {	585	sub DESTROY {
556	my ($self) = @_;	586	my ($self) = @_;
557		587
558	delete $WIDGET{$self+0};	588	delete $WIDGET{$self+0};
559	#$self->deactivate;	589	#$self->deactivate;
…		…
615	my ($class, %arg) = @_;	645	my ($class, %arg) = @_;
616	$class->SUPER::new (can_events => 0, %arg);	646	$class->SUPER::new (can_events => 0, %arg);
617	}	647	}
618		648
619	sub size_request {	649	sub size_request {
620	(0, 0)	650	my ($self) = @_;
		651
		652	($self->{w} + 0, $self->{h} + 0)
621	}	653	}
622		654
623	sub draw { }	655	sub draw { }
624		656
625	#############################################################################	657	#############################################################################
…		…
654	$self->{children} = [	686	$self->{children} = [
655	sort { $a->{z} <=> $b->{z} }	687	sort { $a->{z} <=> $b->{z} }
656	@{$self->{children}}, @widgets	688	@{$self->{children}}, @widgets
657	];	689	];
658		690
659	$self->check_size (1);	691	$self->realloc;
660	$self->update;
661	}	692	}
662		693
663	sub children {	694	sub children {
664	@{ $_[0]{children} }	695	@{ $_[0]{children} }
665	}	696	}
…		…
670	delete $child->{parent};	701	delete $child->{parent};
671	$child->hide;	702	$child->hide;
672		703
673	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	704	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
674		705
675	$self->check_size (1);	706	$self->realloc;
676	$self->update;
677	}	707	}
678		708
679	sub clear {	709	sub clear {
680	my ($self) = @_;	710	my ($self) = @_;
681		711
…		…
685	for (@$children) {	715	for (@$children) {
686	delete $_->{parent};	716	delete $_->{parent};
687	$_->hide;	717	$_->hide;
688	}	718	}
689		719
690	$self->check_size;	720	$self->realloc;
691	$self->update;
692	}	721	}
693		722
694	sub find_widget {	723	sub find_widget {
695	my ($self, $x, $y) = @_;	724	my ($self, $x, $y) = @_;
696		725
…		…
783	$self->SUPER::size_allocate ($w, $h);	812	$self->SUPER::size_allocate ($w, $h);
784	$self->update;	813	$self->update;
785	}	814	}
786		815
787	sub _render {	816	sub _render {
		817	my ($self) = @_;
		818
788	$_[0]{children}[0]->draw;	819	$self->{children}[0]->draw;
789	}	820	}
790		821
791	sub render_child {	822	sub render_child {
792	my ($self) = @_;	823	my ($self) = @_;
793		824
794	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	825	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
795	glClearColor 0, 0, 0, 0;	826	glClearColor 0, 0, 0, 0;
796	glClear GL_COLOR_BUFFER_BIT;	827	glClear GL_COLOR_BUFFER_BIT;
797		828
		829	{
		830	package CFClient::UI::Base;
		831
		832	($draw_x, $draw_y, $draw_w, $draw_h) =
		833	(0, 0, $self->{w}, $self->{h});
		834	}
		835
798	$self->_render;	836	$self->_render;
799	};	837	};
800	}	838	}
801		839
802	sub _draw {	840	sub _draw {
803	my ($self) = @_;	841	my ($self) = @_;
804		842
805	my ($w, $h) = ($self->w, $self->h);	843	my ($w, $h) = @$self{qw(w h)};
806		844
807	my $tex = $self->{texture}	845	my $tex = $self->{texture}
808	or return;	846	or return;
809		847
810	glEnable GL_TEXTURE_2D;	848	glEnable GL_TEXTURE_2D;
…		…
833	}	871	}
834		872
835	sub size_request {	873	sub size_request {
836	my ($self) = @_;	874	my ($self) = @_;
837		875
838	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	876	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
839		877
840	$w = 10 if $self->{scroll_x};	878	$w = 10 if $self->{scroll_x};
841	$h = 10 if $self->{scroll_y};	879	$h = 10 if $self->{scroll_y};
842		880
843	($w, $h)	881	($w, $h)
844	}	882	}
845		883
846	sub size_allocate {	884	sub size_allocate {
847	my ($self, $w, $h) = @_;	885	my ($self, $w, $h) = @_;
848		886
		887	my $child = $self->child;
		888
849	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	889	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
850	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	890	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
851		891
852	$self->child->configure (0, 0, $w, $h);	892	$self->child->configure (0, 0, $w, $h);
853	$self->update;	893	$self->update;
854	}	894	}
855		895
…		…
890	}	930	}
891	}	931	}
892		932
893	sub _render {	933	sub _render {
894	my ($self) = @_;	934	my ($self) = @_;
		935
		936	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		937	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
895		938
896	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	939	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
897		940
898	$self->SUPER::_render;	941	$self->SUPER::_render;
899	}	942	}
…		…
998		1041
999	our @ISA = CFClient::UI::Bin::;	1042	our @ISA = CFClient::UI::Bin::;
1000		1043
1001	use CFClient::OpenGL;	1044	use CFClient::OpenGL;
1002		1045
1003	my @tex =	1046	my $bg =
		1047	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1048	mipmap => 1, wrap => 1;
		1049
		1050	my @border =
1004	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1005	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1052	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1006		1053
1007	sub new {	1054	sub new {
1008	my $class = shift;	1055	my ($class, %arg) = @_;
		1056
		1057	my $title = delete $arg{title};
1009		1058
1010	my $self = $class->SUPER::new (	1059	my $self = $class->SUPER::new (
1011	bg => [1, 1, 1, 1],	1060	bg => [1, 1, 1, 1],
1012	border_bg => [1, 1, 1, 1],	1061	border_bg => [1, 1, 1, 1],
1013	border => 0.6,	1062	border => 0.6,
1014	is_toplevel => 1,
1015	can_events => 1,	1063	can_events => 1,
1016	@_	1064	min_w => 16,
		1065	min_h => 16,
		1066	%arg,
1017	);	1067	);
1018		1068
1019	$self->{title} &&= new CFClient::UI::Label	1069	$self->{title} = new CFClient::UI::Label
1020	align => 0,	1070	align => 0,
1021	valign => 1,	1071	valign => 1,
1022	text => $self->{title},	1072	text => $title,
1023	fontsize => $self->{border};	1073	fontsize => $self->{border}
		1074	if defined $title;
1024		1075
1025	$self	1076	$self
		1077	}
		1078
		1079	sub add {
		1080	my ($self, @widgets) = @_;
		1081
		1082	$self->SUPER::add (@widgets);
		1083	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1026	}	1084	}
1027		1085
1028	sub border {	1086	sub border {
1029	int $_[0]{border} * $::FONTSIZE	1087	int $_[0]{border} * $::FONTSIZE
1030	}	1088	}
1031		1089
1032	sub size_request {	1090	sub size_request {
1033	my ($self) = @_;	1091	my ($self) = @_;
		1092
		1093	$self->{title}->size_request
		1094	if $self->{title};
1034		1095
1035	my ($w, $h) = $self->SUPER::size_request;	1096	my ($w, $h) = $self->SUPER::size_request;
1036		1097
1037	(	1098	(
1038	$w + $self->border * 2,	1099	$w + $self->border * 2,
…		…
1041	}	1102	}
1042		1103
1043	sub size_allocate {	1104	sub size_allocate {
1044	my ($self, $w, $h) = @_;	1105	my ($self, $w, $h) = @_;
1045		1106
		1107	if ($self->{title}) {
		1108	$self->{title}{w} = $w;
		1109	$self->{title}{h} = $h;
		1110	$self->{title}->size_allocate ($w, $h);
		1111	}
		1112
		1113	my $border = $self->border;
		1114
1046	$h -= List::Util::max 0, $self->border * 2;	1115	$h -= List::Util::max 0, $border * 2;
1047	$w -= List::Util::max 0, $self->border * 2;	1116	$w -= List::Util::max 0, $border * 2;
1048		1117
1049	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1050	if $self->{title};
1051
1052	$self->child->configure ($self->border, $self->border, $w, $h);	1118	$self->child->configure ($border, $border, $w, $h);
1053	}	1119	}
1054		1120
1055	sub button_down {	1121	sub button_down {
1056	my ($self, $ev, $x, $y) = @_;	1122	my ($self, $ev, $x, $y) = @_;
1057		1123
…		…
1073	my ($ev, $x, $y) = @_;	1139	my ($ev, $x, $y) = @_;
1074		1140
1075	my $dx = $ev->{x} - $ox;	1141	my $dx = $ev->{x} - $ox;
1076	my $dy = $ev->{y} - $oy;	1142	my $dy = $ev->{y} - $oy;
1077		1143
1078	$self->{user_x} = $wx + $dx * $mx;
1079	$self->{user_y} = $wy + $dy * $my;
1080	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1144	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1081	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1145	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1082	$self->move ($self->{user_x}, $self->{user_y});	1146
1083	$self->check_size;	1147	$self->realloc;
		1148	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1084	};	1149	};
1085		1150
1086	} elsif ($lr ^ $td) {	1151	} elsif ($lr ^ $td) {
1087	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1152	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1088	my ($bx, $by) = ($self->{x}, $self->{y});	1153	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1090	$self->{motion} = sub {	1155	$self->{motion} = sub {
1091	my ($ev, $x, $y) = @_;	1156	my ($ev, $x, $y) = @_;
1092		1157
1093	($x, $y) = ($ev->{x}, $ev->{y});	1158	($x, $y) = ($ev->{x}, $ev->{y});
1094		1159
1095	$self->{user_x} = $bx + $x - $ox;	1160	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1096	$self->{user_y} = $by + $y - $oy;
1097
1098	$self->move ($self->{user_x}, $self->{user_y});
1099	$self->update;
1100	};	1161	};
1101	}	1162	}
1102	}	1163	}
1103		1164
1104	sub button_up {	1165	sub button_up {
…		…
1114	}	1175	}
1115		1176
1116	sub _draw {	1177	sub _draw {
1117	my ($self) = @_;	1178	my ($self) = @_;
1118		1179
		1180	my $child = $self->{children}[0];
		1181
1119	my ($w, $h ) = ($self->{w}, $self->{h});	1182	my ($w, $h ) = ($self->{w}, $self->{h});
1120	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1183	my ($cw, $ch) = ($child->{w}, $child->{h});
1121		1184
1122	glEnable GL_TEXTURE_2D;	1185	glEnable GL_TEXTURE_2D;
1123	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1186	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124		1187
1125	my $border = $self->border;	1188	my $border = $self->border;
1126		1189
1127	glColor @{ $self->{border_bg} };	1190	glColor @{ $self->{border_bg} };
1128	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1191	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1129	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1192	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1193	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1194	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132		1195
1133	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1196	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134	my $bg = $tex[0];	1197	glColor @{ $self->{bg} };
1135		1198
1136	# TODO: repeat texture not scale	1199	# TODO: repeat texture not scale
		1200	# solve this better(?)
1137	my $rep_x = $cw / $bg->{w};	1201	$bg->{s} = $cw / $bg->{w};
1138	my $rep_y = $ch / $bg->{h};	1202	$bg->{t} = $ch / $bg->{h};
1139
1140	glColor @{ $self->{bg} };
1141
1142	$bg->{s} = $rep_x;
1143	$bg->{t} = $rep_y;
1144	$bg->{wrap_mode} = 1;
1145	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1203	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146	}	1204	}
1147		1205
1148	glDisable GL_TEXTURE_2D;	1206	glDisable GL_TEXTURE_2D;
1149		1207
1150	$self->{title}->draw if $self->{title};
1151
1152	$self->child->draw;	1208	$child->draw;
		1209
		1210	if ($self->{title}) {
		1211	glTranslate 0, $border - $self->{h};
		1212	$self->{title}->_draw;
		1213	}
1153	}	1214	}
1154		1215
1155	#############################################################################	1216	#############################################################################
1156		1217
1157	package CFClient::UI::Table;	1218	package CFClient::UI::Table;
…		…
1179	my ($self, $x, $y, $child) = @_;	1240	my ($self, $x, $y, $child) = @_;
1180		1241
1181	$child->set_parent ($self);	1242	$child->set_parent ($self);
1182	$self->{children}[$y][$x] = $child;	1243	$self->{children}[$y][$x] = $child;
1183		1244
1184	$self->check_size (1);	1245	$self->realloc;
1185	}	1246	}
1186		1247
1187	# TODO: move to container class maybe? send children a signal on removal?	1248	# TODO: move to container class maybe? send children a signal on removal?
1188	sub clear {	1249	sub clear {
1189	my ($self) = @_;	1250	my ($self) = @_;
…		…
1194	for (@children) {	1255	for (@children) {
1195	delete $_->{parent};	1256	delete $_->{parent};
1196	$_->hide;	1257	$_->hide;
1197	}	1258	}
1198		1259
1199	$self->check_size (1);	1260	$self->realloc;
1200	$self->update;
1201	}	1261	}
1202		1262
1203	sub get_wh {	1263	sub get_wh {
1204	my ($self) = @_;	1264	my ($self) = @_;
1205		1265
…		…
1413	ellipsise => 3, # end	1473	ellipsise => 3, # end
1414	layout => (new CFClient::Layout),	1474	layout => (new CFClient::Layout),
1415	fontsize => 1,	1475	fontsize => 1,
1416	align => -1,	1476	align => -1,
1417	valign => -1,	1477	valign => -1,
1418	padding => 2,	1478	padding_x => 2,
		1479	padding_y => 2,
1419	can_events => 0,	1480	can_events => 0,
1420	%arg	1481	%arg
1421	);	1482	);
1422		1483
1423	if (exists $self->{template}) {	1484	if (exists $self->{template}) {
…		…
1459	$self->{text} = "T$text";	1520	$self->{text} = "T$text";
1460		1521
1461	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1522	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1462	$self->{layout}->set_text ($text);	1523	$self->{layout}->set_text ($text);
1463		1524
		1525	$self->realloc;
1464	$self->update;	1526	$self->update;
1465	$self->check_size;
1466	}	1527	}
1467		1528
1468	sub set_markup {	1529	sub set_markup {
1469	my ($self, $markup) = @_;	1530	my ($self, $markup) = @_;
1470		1531
…		…
1474	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1535	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1475		1536
1476	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1537	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1477	$self->{layout}->set_markup ($markup);	1538	$self->{layout}->set_markup ($markup);
1478		1539
		1540	$self->realloc;
1479	$self->update;	1541	$self->update;
1480	$self->check_size;
1481	}	1542	}
1482		1543
1483	sub size_request {	1544	sub size_request {
1484	my ($self) = @_;	1545	my ($self) = @_;
1485		1546
…		…
1499		1560
1500	$w = List::Util::max $w, $w2;	1561	$w = List::Util::max $w, $w2;
1501	$h = List::Util::max $h, $h2;	1562	$h = List::Util::max $h, $h2;
1502	}	1563	}
1503		1564
1504	(	1565	($w, $h)
1505	$w + $self->{padding} * 2,
1506	$h + $self->{padding} * 2,
1507	)
1508	}	1566	}
1509		1567
1510	sub size_allocate {	1568	sub size_allocate {
1511	my ($self, $w, $h) = @_;	1569	my ($self, $w, $h) = @_;
1512		1570
		1571	delete $self->{ox};
		1572
1513	delete $self->{texture};	1573	delete $self->{texture}
		1574	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1514	}	1575	}
1515		1576
1516	sub set_fontsize {	1577	sub set_fontsize {
1517	my ($self, $fontsize) = @_;	1578	my ($self, $fontsize) = @_;
1518		1579
1519	$self->{fontsize} = $fontsize;	1580	$self->{fontsize} = $fontsize;
1520	delete $self->{texture};	1581	delete $self->{texture};
1521		1582
1522	$self->update;	1583	$self->realloc;
1523	$self->check_size;
1524	}	1584	}
1525		1585
1526	sub _draw {	1586	sub _draw {
1527	my ($self) = @_;	1587	my ($self) = @_;
1528		1588
…		…
1534	$self->{layout}->set_width ($self->{w});	1594	$self->{layout}->set_width ($self->{w});
1535	$self->{layout}->set_ellipsise ($self->{ellipsise});	1595	$self->{layout}->set_ellipsise ($self->{ellipsise});
1536	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1596	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1537	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1597	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1538		1598
1539	my $tex = new_from_layout CFClient::Texture $self->{layout};	1599	new_from_layout CFClient::Texture $self->{layout}
		1600	};
1540		1601
		1602	unless (exists $self->{ox}) {
1541	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1603	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1542	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1604	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1543	: ($self->{w} - $tex->{w}) * 0.5);	1605	: ($self->{w} - $tex->{w}) * 0.5);
1544		1606
1545	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1607	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1546	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1608	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1547	: ($self->{h} - $tex->{h}) * 0.5);	1609	: ($self->{h} - $tex->{h}) * 0.5);
1548
1549	$tex
1550	};	1610	};
1551		1611
1552	glEnable GL_TEXTURE_2D;	1612	glEnable GL_TEXTURE_2D;
1553	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1554		1614
…		…
1608	sub set_text {	1668	sub set_text {
1609	my ($self, $text) = @_;	1669	my ($self, $text) = @_;
1610		1670
1611	$self->{cursor} = length $text;	1671	$self->{cursor} = length $text;
1612	$self->_set_text ($text);	1672	$self->_set_text ($text);
1613	$self->update;	1673
1614	$self->check_size;	1674	$self->realloc;
1615	}	1675	}
1616		1676
1617	sub get_text {	1677	sub get_text {
1618	$_[0]{text}	1678	$_[0]{text}
1619	}	1679	}
…		…
1652	} elsif ($uni) {	1712	} elsif ($uni) {
1653	substr $text, $self->{cursor}++, 0, chr $uni;	1713	substr $text, $self->{cursor}++, 0, chr $uni;
1654	}	1714	}
1655		1715
1656	$self->_set_text ($text);	1716	$self->_set_text ($text);
1657	$self->update;	1717
1658	$self->check_size;	1718	$self->realloc;
1659	}	1719	}
1660		1720
1661	sub focus_in {	1721	sub focus_in {
1662	my ($self) = @_;	1722	my ($self) = @_;
1663		1723
…		…
1790		1850
1791	sub new {	1851	sub new {
1792	my $class = shift;	1852	my $class = shift;
1793		1853
1794	$class->SUPER::new (	1854	$class->SUPER::new (
1795	padding => 4,	1855	padding_x => 4,
		1856	padding_y => 4,
1796	fg => [1, 1, 1],	1857	fg => [1, 1, 1],
1797	active_fg => [0, 0, 1],	1858	active_fg => [0, 0, 1],
1798	can_hover => 1,	1859	can_hover => 1,
1799	align => 0,	1860	align => 0,
1800	valign => 0,	1861	valign => 0,
…		…
1847		1908
1848	sub new {	1909	sub new {
1849	my $class = shift;	1910	my $class = shift;
1850		1911
1851	$class->SUPER::new (	1912	$class->SUPER::new (
1852	padding => 2,	1913	padding_x => 2,
		1914	padding_y => 2,
1853	fg => [1, 1, 1],	1915	fg => [1, 1, 1],
1854	active_fg => [1, 1, 0],	1916	active_fg => [1, 1, 0],
1855	bg => [0, 0, 0, 0.2],	1917	bg => [0, 0, 0, 0.2],
1856	active_bg => [1, 1, 1, 0.5],	1918	active_bg => [1, 1, 1, 0.5],
1857	state => 0,	1919	state => 0,
…		…
1861	}	1923	}
1862		1924
1863	sub size_request {	1925	sub size_request {
1864	my ($self) = @_;	1926	my ($self) = @_;
1865		1927
1866	($self->{padding} * 2 + 6) x 2	1928	(6) x 2
1867	}	1929	}
1868		1930
1869	sub button_down {	1931	sub button_down {
1870	my ($self, $ev, $x, $y) = @_;	1932	my ($self, $ev, $x, $y) = @_;
1871		1933
1872	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1934	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1873	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1935	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1874	$self->{state} = !$self->{state};	1936	$self->{state} = !$self->{state};
1875	$self->_emit (changed => $self->{state});	1937	$self->_emit (changed => $self->{state});
1876	}	1938	}
1877	}	1939	}
1878		1940
1879	sub _draw {	1941	sub _draw {
1880	my ($self) = @_;	1942	my ($self) = @_;
1881		1943
1882	$self->SUPER::_draw;	1944	$self->SUPER::_draw;
1883		1945
1884	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1946	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1885		1947
1886	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1948	my ($w, $h) = @$self{qw(w h)};
		1949
		1950	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1887		1951
1888	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1952	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1889		1953
1890	my $tex = $self->{state} ? $tex[1] : $tex[0];	1954	my $tex = $self->{state} ? $tex[1] : $tex[0];
1891		1955
…		…
2156	fg => [1, 1, 1],	2220	fg => [1, 1, 1],
2157	active_fg => [0, 0, 0],	2221	active_fg => [0, 0, 0],
2158	bg => [0, 0, 0, 0.2],	2222	bg => [0, 0, 0, 0.2],
2159	active_bg => [1, 1, 1, 0.5],	2223	active_bg => [1, 1, 1, 0.5],
2160	range => [0, 0, 100, 10, 0],	2224	range => [0, 0, 100, 10, 0],
2161	req_w => $::WIDTH / 80,	2225	min_w => $::WIDTH / 80,
2162	req_h => $::WIDTH / 80,	2226	min_h => $::WIDTH / 80,
2163	vertical => 0,	2227	vertical => 0,
2164	can_hover => 1,	2228	can_hover => 1,
2165	inner_pad => 0.02,	2229	inner_pad => 0.02,
2166	@_	2230	@_
2167	);	2231	);
…		…
2170	$self->update;	2234	$self->update;
2171		2235
2172	$self	2236	$self
2173	}	2237	}
2174		2238
		2239	sub changed { }
		2240
2175	sub set_range {	2241	sub set_range {
2176	my ($self, $range) = @_;	2242	my ($self, $range) = @_;
2177		2243
2178	($range, $self->{range}) = ($self->{range}, $range);	2244	($range, $self->{range}) = ($self->{range}, $range);
2179		2245
…		…
2205	}	2271	}
2206		2272
2207	sub size_request {	2273	sub size_request {
2208	my ($self) = @_;	2274	my ($self) = @_;
2209		2275
2210	my $w = $self->{req_w};	2276	($self->{req_w}, $self->{req_h})
2211	my $h = $self->{req_h};
2212
2213	$self->{vertical} ? ($h, $w) : ($w, $h)
2214	}	2277	}
2215		2278
2216	sub button_down {	2279	sub button_down {
2217	my ($self, $ev, $x, $y) = @_;	2280	my ($self, $ev, $x, $y) = @_;
2218		2281
…		…
2603	}	2666	}
2604		2667
2605	sub set_tooltip_from {	2668	sub set_tooltip_from {
2606	my ($self, $widget) = @_;	2669	my ($self, $widget) = @_;
2607		2670
		2671	my $tooltip = $widget->{tooltip};
		2672
		2673	if ($ENV{CFPLUS_DEBUG} & 2) {
		2674	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2675	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2676	. "req $widget->{req_w} $widget->{req_h}\n"
		2677	. "visible $widget->{visible}";
		2678	}
		2679
2608	$self->add (new CFClient::UI::Label	2680	$self->add (new CFClient::UI::Label
2609	markup => $widget->{tooltip},	2681	markup => $tooltip,
2610	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2682	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2611	fontsize => 0.8,	2683	fontsize => 0.8,
2612	fg => [0, 0, 0, 1],	2684	fg => [0, 0, 0, 1],
2613	ellipsise => 0,	2685	ellipsise => 0,
2614	font => ($widget->{tooltip_font} || $::FONT_PROP),	2686	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2625		2697
2626	sub size_allocate {	2698	sub size_allocate {
2627	my ($self, $w, $h) = @_;	2699	my ($self, $w, $h) = @_;
2628		2700
2629	$self->SUPER::size_allocate ($w - 4, $h - 4);	2701	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2702	}
		2703
		2704	sub visibility_change {
		2705	my ($self, $visible) = @_;
		2706
		2707	return unless $visible;
		2708
		2709	$self->{root}->on_post_alloc ("move_$self" => sub {
		2710	my $widget = $self->{owner}
		2711	or return;
		2712
		2713	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2714
		2715	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2716	if $x + $self->{w} > $::WIDTH;
		2717
		2718	$self->move_abs ($x, $y);
		2719	});
2630	}	2720	}
2631		2721
2632	sub _draw {	2722	sub _draw {
2633	my ($self) = @_;	2723	my ($self) = @_;
2634		2724
…		…
2651	glVertex $w, $h;	2741	glVertex $w, $h;
2652	glVertex $w, 0;	2742	glVertex $w, 0;
2653	glEnd;	2743	glEnd;
2654		2744
2655	glTranslate 2 - 0.375, 2 - 0.375;	2745	glTranslate 2 - 0.375, 2 - 0.375;
		2746
2656	$self->SUPER::_draw;	2747	$self->SUPER::_draw;
2657	}	2748	}
2658		2749
2659	#############################################################################	2750	#############################################################################
2660		2751
…		…
2736	$self->SUPER::DESTROY;	2827	$self->SUPER::DESTROY;
2737	}	2828	}
2738		2829
2739	#############################################################################	2830	#############################################################################
2740		2831
2741	package CFClient::UI::Inventory;
2742
2743	our @ISA = CFClient::UI::ScrolledWindow::;
2744
2745	sub new {
2746	my $class = shift;
2747
2748	my $self = $class->SUPER::new (
2749	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2750	@_,
2751	);
2752
2753	$self
2754	}
2755
2756	sub set_items {
2757	my ($self, $items) = @_;
2758
2759	$self->{scrolled}->clear;
2760	return unless $items;
2761
2762	my @items = sort {
2763	($a->{type} <=> $b->{type})
2764	or ($a->{name} cmp $b->{name})
2765	} @$items;
2766
2767	$self->{real_items} = \@items;
2768
2769	my $row = 0;
2770	for my $item (@items) {
2771	CFClient::Item::update_widgets $item;
2772
2773	$self->{scrolled}->add (0, $row, $item->{face_widget});
2774	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2775	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2776
2777	$row++;
2778	}
2779	}
2780
2781	#############################################################################
2782
2783	package CFClient::UI::Menu;	2832	package CFClient::UI::Menu;
2784		2833
2785	our @ISA = CFClient::UI::FancyFrame::;	2834	our @ISA = CFClient::UI::FancyFrame::;
2786		2835
2787	use CFClient::OpenGL;	2836	use CFClient::OpenGL;
…		…
2825	# maybe save $GRAB? must be careful about events...	2874	# maybe save $GRAB? must be careful about events...
2826	$GRAB = $self;	2875	$GRAB = $self;
2827	$self->{button} = $ev->{button};	2876	$self->{button} = $ev->{button};
2828		2877
2829	$self->show;	2878	$self->show;
2830	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2879	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2831	}	2880	}
2832		2881
2833	sub mouse_motion {	2882	sub mouse_motion {
2834	my ($self, $ev, $x, $y) = @_;	2883	my ($self, $ev, $x, $y) = @_;
2835		2884
…		…
2960	$self->SUPER::reconfigure;	3009	$self->SUPER::reconfigure;
2961	}	3010	}
2962		3011
2963	#############################################################################	3012	#############################################################################
2964		3013
2965	package CFClient::UI::Root;	3014	package CFClient::UI::Inventory;
2966		3015
2967	our @ISA = CFClient::UI::Container::;	3016	our @ISA = CFClient::UI::ScrolledWindow::;
2968
2969	use CFClient::OpenGL;
2970		3017
2971	sub new {	3018	sub new {
2972	my $class = shift;	3019	my $class = shift;
2973		3020
2974	$class->SUPER::new (	3021	my $self = $class->SUPER::new (
		3022	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3023	@_,
		3024	);
		3025
		3026	$self
		3027	}
		3028
		3029	sub set_items {
		3030	my ($self, $items) = @_;
		3031
		3032	$self->{scrolled}->clear;
		3033	return unless $items;
		3034
		3035	my @items = sort {
		3036	($a->{type} <=> $b->{type})
		3037	or ($a->{name} cmp $b->{name})
		3038	} @$items;
		3039
		3040	$self->{real_items} = \@items;
		3041
		3042	my $row = 0;
		3043	for my $item (@items) {
		3044	CFClient::Item::update_widgets $item;
		3045
		3046	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3047	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3048	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3049
		3050	$row++;
		3051	}
		3052	}
		3053
		3054	#############################################################################
		3055
		3056	package CFClient::UI::BindEditor;
		3057
		3058	our @ISA = CFClient::UI::FancyFrame::;
		3059
		3060	sub new {
		3061	my $class = shift;
		3062
		3063	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3064
		3065	$self->add (my $vb = new CFClient::UI::VBox);
		3066
		3067
		3068	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3069	text => "start recording",
		3070	tooltip => "Start/Stops recording of actions."
		3071	."All subsequent actions after the recording started will be captured."
		3072	."The actions are displayed after the record was stopped."
		3073	."To bind the action you have to click on the 'Bind' button",
		3074	on_activate => sub {
		3075	unless ($self->{recording}) {
		3076	$self->start;
		3077	} else {
		3078	$self->stop;
		3079	}
		3080	});
		3081
		3082	$vb->add (new CFClient::UI::Label text => "Actions:");
		3083	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3084
		3085	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3086	$vb->add (my $hb = new CFClient::UI::HBox);
		3087	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3088	$hb->add (new CFClient::UI::Button
		3089	text => "bind",
		3090	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3091	on_activate => sub {
		3092	$self->ask_for_bind;
		3093	});
		3094
		3095	$vb->add (my $hb = new CFClient::UI::HBox);
		3096	$hb->add (new CFClient::UI::Button
		3097	text => "ok",
		3098	expand => 1,
		3099	tooltip => "This closes the binding editor and saves the binding",
		3100	on_activate => sub {
		3101	$self->hide;
		3102	$self->commit;
		3103	});
		3104
		3105	$hb->add (new CFClient::UI::Button
		3106	text => "cancel",
		3107	expand => 1,
		3108	tooltip => "This closes the binding editor without saving",
		3109	on_activate => sub {
		3110	$self->hide;
		3111	$self->{binding_cancel}->()
		3112	if $self->{binding_cancel};
		3113	});
		3114
		3115	$self->update_binding_widgets;
		3116
		3117	$self
		3118	}
		3119
		3120	sub commit {
		3121	my ($self) = @_;
		3122	my ($mod, $sym, $cmds) = $self->get_binding;
		3123	if ($sym != 0 && @$cmds > 0) {
		3124	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3125	."'. Don't forget 'Save Config'!");
		3126	$self->{binding_change}->($mod, $sym, $cmds)
		3127	if $self->{binding_change};
		3128	} else {
		3129	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3130	$self->{binding_cancel}->()
		3131	if $self->{binding_cancel};
		3132	}
		3133	}
		3134
		3135	sub start {
		3136	my ($self) = @_;
		3137
		3138	$self->{rec_btn}->set_text ("stop recording");
		3139	$self->{recording} = 1;
		3140	$self->clear_command_list;
		3141	$::CONN->start_record if $::CONN;
		3142	}
		3143
		3144	sub stop {
		3145	my ($self) = @_;
		3146
		3147	$self->{rec_btn}->set_text ("start recording");
		3148	$self->{recording} = 0;
		3149
		3150	my $rec;
		3151	$rec = $::CONN->stop_record if $::CONN;
		3152	return unless ref $rec eq 'ARRAY';
		3153	$self->set_command_list ($rec);
		3154	}
		3155
		3156
		3157	sub ask_for_bind_and_commit {
		3158	my ($self) = @_;
		3159	$self->ask_for_bind (1);
		3160	}
		3161
		3162	sub ask_for_bind {
		3163	my ($self, $commit) = @_;
		3164
		3165	CFClient::Binder::open_binding_dialog (sub {
		3166	my ($mod, $sym) = @_;
		3167	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3168	$self->update_binding_widgets;
		3169	$self->commit if $commit;
		3170	});
		3171	}
		3172
		3173	# $mod and $sym are the modifiers and key symbol
		3174	# $cmds is a array ref of strings (the commands)
		3175	# $cb is the callback that is executed on OK
		3176	# $ccb is the callback that is executed on CANCEL and
		3177	# when the binding was unsuccessful on OK
		3178	sub set_binding {
		3179	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3180
		3181	$self->clear_command_list;
		3182	$self->{recording} = 0;
		3183	$self->{rec_btn}->set_text ("start recording");
		3184
		3185	$self->{binding} = [$mod, $sym];
		3186	$self->{commands} = $cmds;
		3187
		3188	$self->{binding_change} = $cb;
		3189	$self->{binding_cancel} = $ccb;
		3190
		3191	$self->update_binding_widgets;
		3192	}
		3193
		3194	# this is a shortcut method that asks for a binding
		3195	# and then just binds it.
		3196	sub do_quick_binding {
		3197	my ($self, $cmds) = @_;
		3198	$self->set_binding (undef, undef, $cmds, sub {
		3199	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3200	});
		3201	$self->ask_for_bind (1);
		3202	}
		3203
		3204	sub update_binding_widgets {
		3205	my ($self) = @_;
		3206	my ($mod, $sym, $cmds) = $self->get_binding;
		3207	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3208	$self->set_command_list ($cmds);
		3209	}
		3210
		3211	sub get_binding {
		3212	my ($self) = @_;
		3213	return (
		3214	$self->{binding}->[0],
		3215	$self->{binding}->[1],
		3216	[ grep { defined $_ } @{$self->{commands}} ]
		3217	);
		3218	}
		3219
		3220	sub clear_command_list {
		3221	my ($self) = @_;
		3222	$self->{cmdbox}->clear ();
		3223	}
		3224
		3225	sub set_command_list {
		3226	my ($self, $cmds) = @_;
		3227
		3228	$self->{cmdbox}->clear ();
		3229	$self->{commands} = $cmds;
		3230
		3231	my $idx = 0;
		3232
		3233	for (@$cmds) {
		3234	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3235
		3236	my $i = $idx;
		3237	$hb->add (new CFClient::UI::Label text => $_);
		3238	$hb->add (new CFClient::UI::Button
		3239	text => "delete",
		3240	tooltip => "Deletes the action from the record",
		3241	on_activate => sub {
		3242	$self->{cmdbox}->remove ($hb);
		3243	$cmds->[$i] = undef;
		3244	});
		3245
		3246
		3247	$idx++
		3248	}
		3249	}
		3250
		3251	#############################################################################
		3252
		3253	package CFClient::UI::SpellList;
		3254
		3255	our @ISA = CFClient::UI::FancyFrame::;
		3256
		3257	sub new {
		3258	my $class = shift;
		3259
		3260	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3261
		3262	$self->add (new CFClient::UI::ScrolledWindow
		3263	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3264
		3265	$self;
		3266	}
		3267
		3268	# XXX: Do sorting? Argl...
		3269	sub add_spell {
		3270	my ($self, $spell) = @_;
		3271	$self->{spells}->{$spell->{name}} = $spell;
		3272
		3273	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3274	face => $spell->{face},
		3275	can_hover => 1,
		3276	can_events => 1,
		3277	tooltip => $spell->{message});
		3278
		3279	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3280	text => $spell->{name},
		3281	can_hover => 1,
		3282	can_events => 1,
		3283	tooltip => $spell->{message},
		3284	expand => 1);
		3285
		3286	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3287	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3288	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3289	expand => 1);
		3290
		3291	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3292	text => "bind to key",
		3293	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3294	}
		3295
		3296	sub rebuild_spell_list {
		3297	my ($self) = @_;
		3298	$self->{tbl_idx} = 0;
		3299	$self->add_spell ($_) for values %{$self->{spells}};
		3300	}
		3301
		3302	sub remove_spell {
		3303	my ($self, $spell) = @_;
		3304	delete $self->{spells}->{$spell->{name}};
		3305	$self->rebuild_spell_list;
		3306	}
		3307
		3308	#############################################################################
		3309
		3310	package CFClient::UI::Root;
		3311
		3312	our @ISA = CFClient::UI::Container::;
		3313
		3314	use CFClient::OpenGL;
		3315
		3316	sub new {
		3317	my $class = shift;
		3318
		3319	my $self = $class->SUPER::new (
2975	visible => 1,	3320	visible => 1,
2976	@_,	3321	@_,
2977	)	3322	);
2978	}
2979		3323
2980	sub configure {	3324	Scalar::Util::weaken ($self->{root} = $self);
2981	my ($self, $x, $y, $w, $h) = @_;
2982		3325
2983	$self->{w} = $w;	3326	$self
2984	$self->{h} = $h;
2985	}
2986
2987	sub check_size {
2988	my ($self) = @_;
2989
2990	$self->size_allocate ($self->{w}, $self->{h})
2991	if $self->{w};
2992	}	3327	}
2993		3328
2994	sub size_request {	3329	sub size_request {
2995	my ($self) = @_;	3330	my ($self) = @_;
2996		3331
2997	($self->{w}, $self->{h})	3332	($self->{w}, $self->{h})
		3333	}
		3334
		3335	sub _to_pixel {
		3336	my ($coord, $size, $max) = @_;
		3337
		3338	$coord =
		3339	$coord eq "center" ? ($max - $size) * 0.5
		3340	: $coord eq "max" ? $max
		3341	: $coord;
		3342
		3343	$coord = 0 if $coord < 0;
		3344	$coord = $max - $size if $coord > $max - $size;
		3345
		3346	int $coord + 0.5
2998	}	3347	}
2999		3348
3000	sub size_allocate {	3349	sub size_allocate {
3001	my ($self, $w, $h) = @_;	3350	my ($self, $w, $h) = @_;
3002		3351
3003	for my $child ($self->children) {	3352	for my $child ($self->children) {
3004	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3353	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3005		3354
3006	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3355	$X = $child->{force_x} if exists $child->{force_x};
3007	if exists $child->{req_x};	3356	$Y = $child->{force_y} if exists $child->{force_y};
3008		3357
3009	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3358	$X = _to_pixel $X, $W, $self->{w};
3010	if exists $child->{req_y};	3359	$Y = _to_pixel $Y, $H, $self->{h};
3011
3012	delete @$child{qw(req_x req_y)};
3013
3014	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3015	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3016		3360
3017	$child->configure ($X, $Y, $W, $H);	3361	$child->configure ($X, $Y, $W, $H);
3018	}	3362	}
3019	}	3363	}
3020		3364
…		…
3031	}	3375	}
3032		3376
3033	sub update {	3377	sub update {
3034	my ($self) = @_;	3378	my ($self) = @_;
3035		3379
3036	$self->check_size;
3037	$::WANT_REFRESH++;	3380	$::WANT_REFRESH++;
3038	}	3381	}
3039		3382
3040	sub add {	3383	sub add {
3041	my ($self, @children) = @_;	3384	my ($self, @children) = @_;
3042		3385
3043	for my $child (@children) {
3044	$child->{is_toplevel} = 1;	3386	$_->{is_toplevel} = 1
3045		3387	for @children;
3046	# integerise window positions
3047	$child->{x} = int $child->{x};
3048	$child->{y} = int $child->{y};
3049	}
3050		3388
3051	$self->SUPER::add (@children);	3389	$self->SUPER::add (@children);
3052
3053	for (my @widgets = @children; my $w = pop @widgets; ) {
3054	push @widgets, $w->children;
3055	$w->set_visible;
3056	}
3057
3058	}	3390	}
3059		3391
3060	sub remove {	3392	sub remove {
3061	my ($self, @children) = @_;	3393	my ($self, @children) = @_;
3062		3394
3063	$self->SUPER::remove (@children);	3395	$self->SUPER::remove (@children);
		3396
		3397	delete $self->{is_toplevel}
		3398	for @children;
3064		3399
3065	while (@children) {	3400	while (@children) {
3066	my $w = pop @children;	3401	my $w = pop @children;
3067	push @children, $w->children;	3402	push @children, $w->children;
3068	$w->set_invisible;	3403	$w->set_invisible;
…		…
3087	while ($self->{refresh_hook}) {	3422	while ($self->{refresh_hook}) {
3088	$_->()	3423	$_->()
3089	for values %{delete $self->{refresh_hook}};	3424	for values %{delete $self->{refresh_hook}};
3090	}	3425	}
3091		3426
3092	if ($self->{check_size}) {	3427	if ($self->{realloc}) {
		3428	my %queue;
3093	my @queue;	3429	my @queue;
		3430	my $widget;
3094		3431
3095	for (;;) {	3432	outer:
3096	if ($self->{check_size}) {	3433	while () {
3097	#TODO use array-of-depth approach	3434	if (my $realloc = delete $self->{realloc}) {
		3435	for $widget (values %$realloc) {
		3436	$widget->{visible} or next; # do not resize invisible widgets
3098		3437
3099	@queue = sort { $a->{visible} <=> $b->{visible} }	3438	$queue{$widget+0}++ and next; # duplicates are common
3100	@queue, values %{delete $self->{check_size}};	3439
		3440	push @{ $queue[$widget->{visible}] }, $widget;
		3441	}
3101	}	3442	}
3102		3443
		3444	while () {
		3445	@queue or last outer;
		3446
3103	my $widget = pop @queue || last;	3447	$widget = pop @{ $queue[-1] || [] }
3104		3448	and last;
3105	defined $widget->{visible} or last; # do not resize invisible widgets
3106
3107	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3108	? @$widget{qw(def_w def_h)}
3109	: $widget->size_request;
3110
3111	if (delete $widget->{force_alloc}
3112	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3113	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3114		3449
		3450	pop @queue;
		3451	}
		3452
		3453	delete $queue{$widget+0};
		3454
		3455	my ($w, $h) = $widget->size_request;
		3456
		3457	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3458	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3459
		3460	$w = $widget->{force_w} if exists $widget->{force_w};
		3461	$h = $widget->{force_h} if exists $widget->{force_h};
		3462
		3463	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3464	|| delete $widget->{force_realloc}) {
3115	$widget->{req_w} = $w;	3465	$widget->{req_w} = $w;
3116	$widget->{req_h} = $h;	3466	$widget->{req_h} = $h;
3117		3467
3118	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3468	$self->{size_alloc}{$widget+0} = $widget;
3119		3469
3120	$widget->{parent}->check_size
3121	if $widget->{parent};	3470	if (my $parent = $widget->{parent}) {
		3471	$self->{realloc}{$parent+0} = $parent
		3472	unless $queue{$parent+0};
		3473
		3474	$parent->{force_size_alloc} = 1;
		3475	$self->{size_alloc}{$parent+0} = $parent;
		3476	}
3122	}	3477	}
		3478
		3479	delete $self->{realloc}{$widget+0};
3123	}	3480	}
3124	}	3481	}
3125		3482
3126	while ($self->{size_alloc}) {	3483	while (my $size_alloc = delete $self->{size_alloc}) {
3127	for (values %{delete $self->{size_alloc}}) {	3484	my @queue = sort { $b->{visible} <=> $a->{visible} }
3128	my ($widget, $w, $h) = @$_;	3485	values %$size_alloc;
		3486
		3487	while () {
		3488	my $widget = pop @queue || last;
		3489
		3490	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3129		3491
3130	$w = 0 if $w < 0;	3492	$w = 0 if $w < 0;
3131	$h = 0 if $h < 0;	3493	$h = 0 if $h < 0;
3132		3494
		3495	$w = int $w + 0.5;
		3496	$h = int $h + 0.5;
		3497
		3498	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3499	$widget->{old_w} = $widget->{w};
		3500	$widget->{old_h} = $widget->{h};
		3501
3133	$widget->{w} = $w;	3502	$widget->{w} = $w;
3134	$widget->{h} = $h;	3503	$widget->{h} = $h;
		3504
3135	$widget->emit (size_allocate => $w, $h);	3505	$widget->emit (size_allocate => $w, $h);
		3506	}
3136	}	3507	}
3137	}	3508	}
3138		3509
3139	while ($self->{post_alloc_hook}) {	3510	while ($self->{post_alloc_hook}) {
3140	$_->()	3511	$_->()
3141	for values %{delete $self->{post_alloc_hook}};	3512	for values %{delete $self->{post_alloc_hook}};
3142	}	3513	}
		3514
3143		3515
3144	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3516	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3145	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3517	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3146	glClear GL_COLOR_BUFFER_BIT;	3518	glClear GL_COLOR_BUFFER_BIT;
3147		3519
…		…
3149	glLoadIdentity;	3521	glLoadIdentity;
3150	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3522	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3151	glMatrixMode GL_MODELVIEW;	3523	glMatrixMode GL_MODELVIEW;
3152	glLoadIdentity;	3524	glLoadIdentity;
3153		3525
		3526	{
		3527	package CFClient::UI::Base;
		3528
		3529	($draw_x, $draw_y, $draw_w, $draw_h) =
		3530	(0, 0, $self->{w}, $self->{h});
		3531	}
		3532
3154	$self->_draw;	3533	$self->_draw;
3155	}	3534	}
3156		3535
3157	#############################################################################	3536	#############################################################################
3158		3537

Diff Legend

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