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.250 by root, Sun May 28 02:31:03 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 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	}	237	}
225		238
…		…
236	return if $self->{parent};	249	return if $self->{parent};
237		250
238	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
239	}	252	}
240		253
241	sub center {
242	my ($self) = @_;
243
244	$CFClient::UI::ROOT->on_post_alloc (
245	"center_$self" => sub {
246	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
247	},
248	);
249
250	$self->update;
251	}
252
253	sub set_visible {	254	sub set_visible {
254	my ($self) = @_;	255	my ($self) = @_;
255		256
256	return if $self->{visible};	257	return if $self->{visible};
257		258
258	$self->{root} = $self->{parent}{root};	259	$self->{root} = $self->{parent}{root};
259	$self->{visible} = $self->{parent}{visible} + 1;	260	$self->{visible} = $self->{parent}{visible} + 1;
260		261
261	$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;
262	}	267	}
263		268
264	sub set_invisible {	269	sub set_invisible {
265	my ($self) = @_;	270	my ($self) = @_;
266		271
267	return unless $self->{visible};	272	return unless $self->{visible};
268		273
269	# broken show/hide model	274	$_->set_invisible for $self->children;
270		275
271	delete $self->{root};	276	delete $self->{root};
272	delete $self->{visible};	277	delete $self->{visible};
273		278
274	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
275	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
276		281
277	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
278	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
279		284
280	$self->focus_out;	285	$self->focus_out;
281		286
282	$self->emit (visibility_change => 0);	287	$self->emit (visibility_change => 0);
283	}	288	}
…		…
306		311
307	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
308	if $self->{parent};	313	if $self->{parent};
309	}	314	}
310		315
311	sub move {	316	sub move_abs {
312	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
313		318
314	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
315	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
316	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
317		322
318	$self->update;	323	$self->update;
319	}	324	}
320		325
321	sub set_size {	326	sub set_size {
322	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
323		328
324	$self->{def_w} = $w;	329	$self->{force_w} = $w;
325	$self->{def_h} = $h;	330	$self->{force_h} = $h;
326		331
327	$self->check_size;	332	$self->realloc;
328	}	333	}
329		334
330	sub size_request {	335	sub size_request {
331	require Carp;	336	require Carp;
332	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
334		339
335	sub configure {	340	sub configure {
336	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
337		342
338	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
339	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
340	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
341		348
342	# use alignment to adjust x, y	349	# use alignment to adjust x, y
343		350
344	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
345	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
346
347	($w, $h) = ($w2, $h2);
348	}	353	}
349		354
350	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
351	$self->{x} = $x;	356	$self->{x} = $x;
352	$self->{y} = $y;	357	$self->{y} = $y;
353	$self->update;	358	$self->update;
354	}	359	}
355		360
356	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
357	$CFClient::UI::ROOT->{size_alloc}{$self+0} = [$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;
358	}	368	}
359	}	369	}
360		370
361	sub size_allocate {	371	sub size_allocate {
362	# nothing to be done	372	# nothing to be done
363	}
364
365	sub reconfigure {
366	my ($self) = @_;
367
368	$self->check_size (1);
369	$self->update;
370	}	373	}
371		374
372	sub children {	375	sub children {
373	}	376	}
374		377
…		…
436		439
437	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	440	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
438	unless $FOCUS;	441	unless $FOCUS;
439	}	442	}
440		443
441	sub mouse_motion { }	444	sub mouse_motion { 0 }
442	sub button_up { }	445	sub button_up { 0 }
443	sub key_down { }	446	sub key_down { 0 }
444	sub key_up { }	447	sub key_up { 0 }
445		448
446	sub button_down {	449	sub button_down {
447	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
448		451
449	$self->focus_in;	452	$self->focus_in;
450	}
451		453
452	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	454	0
453	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	455	}
454	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	456
455	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	457	sub find_widget {
456	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	458	my ($self, $x, $y) = @_;
		459
		460	return () unless $self->{can_events};
		461
		462	return $self
		463	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		464	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		465
		466	()
		467	}
		468
		469	sub set_parent {
		470	my ($self, $parent) = @_;
		471
		472	Scalar::Util::weaken ($self->{parent} = $parent);
		473	$self->set_visible if $parent->{visible};
		474	}
		475
		476	sub connect {
		477	my ($self, $signal, $cb) = @_;
		478
		479	push @{ $self->{signal_cb}{$signal} }, $cb;
		480	}
		481
		482	sub _emit {
		483	my ($self, $signal, @args) = @_;
		484
		485	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		486	}
		487
		488	sub emit {
		489	my ($self, $signal, @args) = @_;
		490
		491	$self->_emit ($signal, @args)
		492	|| $self->$signal (@args);
		493	}
		494
		495	sub visibility_change {
		496	#my ($self, $visible) = @_;
		497	}
		498
		499	sub realloc {
		500	my ($self) = @_;
		501
		502	if ($self->{visible}) {
		503	return if $self->{root}{realloc}{$self+0};
		504
		505	$self->{root}{realloc}{$self+0} = $self;
		506	$self->{root}->update;
		507	} else {
		508	delete $self->{req_w};
		509	delete $self->{req_h};
		510	}
		511	}
		512
		513	sub update {
		514	my ($self) = @_;
		515
		516	$self->{parent}->update
		517	if $self->{parent};
		518	}
		519
		520	sub reconfigure {
		521	my ($self) = @_;
		522
		523	$self->realloc;
		524	$self->update;
		525	}
		526
		527	# using global variables seems a bit hacky, but passing through all drawing
		528	# functions seems pointless.
		529	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
457		530
458	sub draw {	531	sub draw {
459	my ($self) = @_;	532	my ($self) = @_;
460		533
461	return unless $self->{h} && $self->{w};	534	return unless $self->{h} && $self->{w};
		535
		536	# update screen rectangle
		537	local $draw_x = $draw_x + $self->{x};
		538	local $draw_y = $draw_y + $self->{y};
		539	local $draw_w = $draw_x + $self->{w};
		540	local $draw_h = $draw_y + $self->{h};
		541
		542	# skip widgets that are entirely outside the drawing area
		543	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		544	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
462		545
463	glPushMatrix;	546	glPushMatrix;
464	glTranslate $self->{x}, $self->{y}, 0;	547	glTranslate $self->{x}, $self->{y}, 0;
465	$self->_draw;	548	$self->_draw;
466	glPopMatrix;	549	glPopMatrix;
…		…
478	glVertex $x , $y + $self->{h};	561	glVertex $x , $y + $self->{h};
479	glEnd;	562	glEnd;
480	glDisable GL_BLEND;	563	glDisable GL_BLEND;
481	}	564	}
482		565
483	if ($ENV{PCLIENT_DEBUG}) {	566	if ($ENV{CFPLUS_DEBUG} & 1) {
484	glPushMatrix;	567	glPushMatrix;
485	glColor 1, 1, 0, 1;	568	glColor 1, 1, 0, 1;
486	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	569	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
487	glBegin GL_LINE_LOOP;	570	glBegin GL_LINE_LOOP;
488	glVertex 0 , 0;	571	glVertex 0 , 0;
…		…
499	my ($self) = @_;	582	my ($self) = @_;
500		583
501	warn "no draw defined for $self\n";	584	warn "no draw defined for $self\n";
502	}	585	}
503		586
504	sub find_widget {
505	my ($self, $x, $y) = @_;
506
507	return () unless $self->{can_events};
508
509	return $self
510	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
511	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
512
513	()
514	}
515
516	sub set_parent {
517	my ($self, $parent) = @_;
518
519	Scalar::Util::weaken ($self->{parent} = $parent);
520
521	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
522
523	$self->check_size;
524	}
525
526	sub check_size {
527	my ($self, $forced) = @_;
528
529	$self->{force_alloc} = 1 if $forced;
530	$CFClient::UI::ROOT->{check_size}{$self} = $self;
531	}
532
533	sub update {
534	my ($self) = @_;
535
536	$self->{parent}->update
537	if $self->{parent};
538	}
539
540	sub connect {
541	my ($self, $signal, $cb) = @_;
542
543	push @{ $self->{signal_cb}{$signal} }, $cb;
544	}
545
546	sub _emit {
547	my ($self, $signal, @args) = @_;
548
549	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
550	}
551
552	sub emit {
553	my ($self, $signal, @args) = @_;
554
555	$self->_emit ($signal, @args)
556	|| $self->$signal (@args);
557	}
558
559	sub visibility_change {
560	#my ($self, $visible) = @_;
561	}
562
563	sub DESTROY {	587	sub DESTROY {
564	my ($self) = @_;	588	my ($self) = @_;
565		589
566	delete $WIDGET{$self+0};	590	delete $WIDGET{$self+0};
567	#$self->deactivate;	591	#$self->deactivate;
…		…
623	my ($class, %arg) = @_;	647	my ($class, %arg) = @_;
624	$class->SUPER::new (can_events => 0, %arg);	648	$class->SUPER::new (can_events => 0, %arg);
625	}	649	}
626		650
627	sub size_request {	651	sub size_request {
628	(0, 0)	652	my ($self) = @_;
		653
		654	($self->{w} + 0, $self->{h} + 0)
629	}	655	}
630		656
631	sub draw { }	657	sub draw { }
632		658
633	#############################################################################	659	#############################################################################
…		…
662	$self->{children} = [	688	$self->{children} = [
663	sort { $a->{z} <=> $b->{z} }	689	sort { $a->{z} <=> $b->{z} }
664	@{$self->{children}}, @widgets	690	@{$self->{children}}, @widgets
665	];	691	];
666		692
667	$self->check_size (1);	693	$self->realloc;
668	$self->update;
669	}	694	}
670		695
671	sub children {	696	sub children {
672	@{ $_[0]{children} }	697	@{ $_[0]{children} }
673	}	698	}
…		…
678	delete $child->{parent};	703	delete $child->{parent};
679	$child->hide;	704	$child->hide;
680		705
681	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	706	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
682		707
683	$self->check_size (1);	708	$self->realloc;
684	$self->update;
685	}	709	}
686		710
687	sub clear {	711	sub clear {
688	my ($self) = @_;	712	my ($self) = @_;
689		713
…		…
693	for (@$children) {	717	for (@$children) {
694	delete $_->{parent};	718	delete $_->{parent};
695	$_->hide;	719	$_->hide;
696	}	720	}
697		721
698	$self->check_size;	722	$self->realloc;
699	$self->update;
700	}	723	}
701		724
702	sub find_widget {	725	sub find_widget {
703	my ($self, $x, $y) = @_;	726	my ($self, $x, $y) = @_;
704		727
…		…
791	$self->SUPER::size_allocate ($w, $h);	814	$self->SUPER::size_allocate ($w, $h);
792	$self->update;	815	$self->update;
793	}	816	}
794		817
795	sub _render {	818	sub _render {
		819	my ($self) = @_;
		820
796	$_[0]{children}[0]->draw;	821	$self->{children}[0]->draw;
797	}	822	}
798		823
799	sub render_child {	824	sub render_child {
800	my ($self) = @_;	825	my ($self) = @_;
801		826
802	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	827	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
803	glClearColor 0, 0, 0, 0;	828	glClearColor 0, 0, 0, 0;
804	glClear GL_COLOR_BUFFER_BIT;	829	glClear GL_COLOR_BUFFER_BIT;
805		830
		831	{
		832	package CFClient::UI::Base;
		833
		834	($draw_x, $draw_y, $draw_w, $draw_h) =
		835	(0, 0, $self->{w}, $self->{h});
		836	}
		837
806	$self->_render;	838	$self->_render;
807	};	839	};
808	}	840	}
809		841
810	sub _draw {	842	sub _draw {
811	my ($self) = @_;	843	my ($self) = @_;
812		844
813	my ($w, $h) = ($self->w, $self->h);	845	my ($w, $h) = @$self{qw(w h)};
814		846
815	my $tex = $self->{texture}	847	my $tex = $self->{texture}
816	or return;	848	or return;
817		849
818	glEnable GL_TEXTURE_2D;	850	glEnable GL_TEXTURE_2D;
…		…
841	}	873	}
842		874
843	sub size_request {	875	sub size_request {
844	my ($self) = @_;	876	my ($self) = @_;
845		877
846	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	878	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847		879
848	$w = 10 if $self->{scroll_x};	880	$w = 10 if $self->{scroll_x};
849	$h = 10 if $self->{scroll_y};	881	$h = 10 if $self->{scroll_y};
850		882
851	($w, $h)	883	($w, $h)
852	}	884	}
853		885
854	sub size_allocate {	886	sub size_allocate {
855	my ($self, $w, $h) = @_;	887	my ($self, $w, $h) = @_;
856		888
		889	my $child = $self->child;
		890
857	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	891	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	892	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859		893
860	$self->child->configure (0, 0, $w, $h);	894	$self->child->configure (0, 0, $w, $h);
861	$self->update;	895	$self->update;
862	}	896	}
863		897
…		…
898	}	932	}
899	}	933	}
900		934
901	sub _render {	935	sub _render {
902	my ($self) = @_;	936	my ($self) = @_;
		937
		938	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		939	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
903		940
904	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	941	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905		942
906	$self->SUPER::_render;	943	$self->SUPER::_render;
907	}	944	}
…		…
1006		1043
1007	our @ISA = CFClient::UI::Bin::;	1044	our @ISA = CFClient::UI::Bin::;
1008		1045
1009	use CFClient::OpenGL;	1046	use CFClient::OpenGL;
1010		1047
1011	my @tex =	1048	my $bg =
		1049	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1050	mipmap => 1, wrap => 1;
		1051
		1052	my @border =
1012	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1053	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1054	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014		1055
1015	sub new {	1056	sub new {
1016	my $class = shift;	1057	my ($class, %arg) = @_;
		1058
		1059	my $title = delete $arg{title};
1017		1060
1018	my $self = $class->SUPER::new (	1061	my $self = $class->SUPER::new (
1019	bg => [1, 1, 1, 1],	1062	bg => [1, 1, 1, 1],
1020	border_bg => [1, 1, 1, 1],	1063	border_bg => [1, 1, 1, 1],
1021	border => 0.6,	1064	border => 0.6,
1022	is_toplevel => 1,
1023	can_events => 1,	1065	can_events => 1,
1024	@_	1066	min_w => 16,
		1067	min_h => 16,
		1068	%arg,
1025	);	1069	);
1026		1070
1027	$self->{title} &&= new CFClient::UI::Label	1071	$self->{title} = new CFClient::UI::Label
1028	align => 0,	1072	align => 0,
1029	valign => 1,	1073	valign => 1,
1030	text => $self->{title},	1074	text => $title,
1031	fontsize => $self->{border};	1075	fontsize => $self->{border}
		1076	if defined $title;
1032		1077
1033	$self	1078	$self
		1079	}
		1080
		1081	sub add {
		1082	my ($self, @widgets) = @_;
		1083
		1084	$self->SUPER::add (@widgets);
		1085	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1034	}	1086	}
1035		1087
1036	sub border {	1088	sub border {
1037	int $_[0]{border} * $::FONTSIZE	1089	int $_[0]{border} * $::FONTSIZE
1038	}	1090	}
1039		1091
1040	sub size_request {	1092	sub size_request {
1041	my ($self) = @_;	1093	my ($self) = @_;
		1094
		1095	$self->{title}->size_request
		1096	if $self->{title};
1042		1097
1043	my ($w, $h) = $self->SUPER::size_request;	1098	my ($w, $h) = $self->SUPER::size_request;
1044		1099
1045	(	1100	(
1046	$w + $self->border * 2,	1101	$w + $self->border * 2,
…		…
1049	}	1104	}
1050		1105
1051	sub size_allocate {	1106	sub size_allocate {
1052	my ($self, $w, $h) = @_;	1107	my ($self, $w, $h) = @_;
1053		1108
		1109	if ($self->{title}) {
		1110	$self->{title}{w} = $w;
		1111	$self->{title}{h} = $h;
		1112	$self->{title}->size_allocate ($w, $h);
		1113	}
		1114
		1115	my $border = $self->border;
		1116
1054	$h -= List::Util::max 0, $self->border * 2;	1117	$h -= List::Util::max 0, $border * 2;
1055	$w -= List::Util::max 0, $self->border * 2;	1118	$w -= List::Util::max 0, $border * 2;
1056		1119
1057	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1058	if $self->{title};
1059
1060	$self->child->configure ($self->border, $self->border, $w, $h);	1120	$self->child->configure ($border, $border, $w, $h);
1061	}	1121	}
1062		1122
1063	sub button_down {	1123	sub button_down {
1064	my ($self, $ev, $x, $y) = @_;	1124	my ($self, $ev, $x, $y) = @_;
1065		1125
…		…
1081	my ($ev, $x, $y) = @_;	1141	my ($ev, $x, $y) = @_;
1082		1142
1083	my $dx = $ev->{x} - $ox;	1143	my $dx = $ev->{x} - $ox;
1084	my $dy = $ev->{y} - $oy;	1144	my $dy = $ev->{y} - $oy;
1085		1145
1086	$self->{user_x} = $wx + $dx * $mx;
1087	$self->{user_y} = $wy + $dy * $my;
1088	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1146	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1147	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090	$self->move ($self->{user_x}, $self->{user_y});	1148
1091	$self->check_size;	1149	$self->realloc;
		1150	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1092	};	1151	};
1093		1152
1094	} elsif ($lr ^ $td) {	1153	} elsif ($lr ^ $td) {
1095	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1154	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1096	my ($bx, $by) = ($self->{x}, $self->{y});	1155	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1098	$self->{motion} = sub {	1157	$self->{motion} = sub {
1099	my ($ev, $x, $y) = @_;	1158	my ($ev, $x, $y) = @_;
1100		1159
1101	($x, $y) = ($ev->{x}, $ev->{y});	1160	($x, $y) = ($ev->{x}, $ev->{y});
1102		1161
1103	$self->{user_x} = $bx + $x - $ox;	1162	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104	$self->{user_y} = $by + $y - $oy;
1105
1106	$self->move ($self->{user_x}, $self->{user_y});
1107	$self->update;
1108	};	1163	};
		1164	} else {
		1165	return 0;
		1166	}
		1167
1109	}	1168	1
1110	}	1169	}
1111		1170
1112	sub button_up {	1171	sub button_up {
1113	my ($self, $ev, $x, $y) = @_;	1172	my ($self, $ev, $x, $y) = @_;
1114		1173
1115	delete $self->{motion};	1174	!!delete $self->{motion}
1116	}	1175	}
1117		1176
1118	sub mouse_motion {	1177	sub mouse_motion {
1119	my ($self, $ev, $x, $y) = @_;	1178	my ($self, $ev, $x, $y) = @_;
1120		1179
1121	$self->{motion}->($ev, $x, $y) if $self->{motion};	1180	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1181
		1182	!!$self->{motion}
1122	}	1183	}
1123		1184
1124	sub _draw {	1185	sub _draw {
1125	my ($self) = @_;	1186	my ($self) = @_;
1126		1187
		1188	my $child = $self->{children}[0];
		1189
1127	my ($w, $h ) = ($self->{w}, $self->{h});	1190	my ($w, $h ) = ($self->{w}, $self->{h});
1128	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1191	my ($cw, $ch) = ($child->{w}, $child->{h});
1129		1192
1130	glEnable GL_TEXTURE_2D;	1193	glEnable GL_TEXTURE_2D;
1131	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1194	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132		1195
1133	my $border = $self->border;	1196	my $border = $self->border;
1134		1197
1135	glColor @{ $self->{border_bg} };	1198	glColor @{ $self->{border_bg} };
1136	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1199	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1137	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1200	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1138	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1201	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1139	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1202	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1140		1203
1141	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1204	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1142	my $bg = $tex[0];	1205	glColor @{ $self->{bg} };
1143		1206
1144	# TODO: repeat texture not scale	1207	# TODO: repeat texture not scale
		1208	# solve this better(?)
1145	my $rep_x = $cw / $bg->{w};	1209	$bg->{s} = $cw / $bg->{w};
1146	my $rep_y = $ch / $bg->{h};	1210	$bg->{t} = $ch / $bg->{h};
1147
1148	glColor @{ $self->{bg} };
1149
1150	$bg->{s} = $rep_x;
1151	$bg->{t} = $rep_y;
1152	$bg->{wrap_mode} = 1;
1153	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1211	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154	}	1212	}
1155		1213
1156	glDisable GL_TEXTURE_2D;	1214	glDisable GL_TEXTURE_2D;
1157		1215
1158	$self->{title}->draw if $self->{title};
1159
1160	$self->child->draw;	1216	$child->draw;
		1217
		1218	if ($self->{title}) {
		1219	glTranslate 0, $border - $self->{h};
		1220	$self->{title}->_draw;
		1221	}
1161	}	1222	}
1162		1223
1163	#############################################################################	1224	#############################################################################
1164		1225
1165	package CFClient::UI::Table;	1226	package CFClient::UI::Table;
…		…
1187	my ($self, $x, $y, $child) = @_;	1248	my ($self, $x, $y, $child) = @_;
1188		1249
1189	$child->set_parent ($self);	1250	$child->set_parent ($self);
1190	$self->{children}[$y][$x] = $child;	1251	$self->{children}[$y][$x] = $child;
1191		1252
1192	$self->check_size (1);	1253	$self->realloc;
1193	}	1254	}
1194		1255
1195	# TODO: move to container class maybe? send children a signal on removal?	1256	# TODO: move to container class maybe? send children a signal on removal?
1196	sub clear {	1257	sub clear {
1197	my ($self) = @_;	1258	my ($self) = @_;
…		…
1202	for (@children) {	1263	for (@children) {
1203	delete $_->{parent};	1264	delete $_->{parent};
1204	$_->hide;	1265	$_->hide;
1205	}	1266	}
1206		1267
1207	$self->check_size (1);	1268	$self->realloc;
1208	$self->update;
1209	}	1269	}
1210		1270
1211	sub get_wh {	1271	sub get_wh {
1212	my ($self) = @_;	1272	my ($self) = @_;
1213		1273
…		…
1421	ellipsise => 3, # end	1481	ellipsise => 3, # end
1422	layout => (new CFClient::Layout),	1482	layout => (new CFClient::Layout),
1423	fontsize => 1,	1483	fontsize => 1,
1424	align => -1,	1484	align => -1,
1425	valign => -1,	1485	valign => -1,
1426	padding => 2,	1486	padding_x => 2,
		1487	padding_y => 2,
1427	can_events => 0,	1488	can_events => 0,
1428	%arg	1489	%arg
1429	);	1490	);
1430		1491
1431	if (exists $self->{template}) {	1492	if (exists $self->{template}) {
…		…
1467	$self->{text} = "T$text";	1528	$self->{text} = "T$text";
1468		1529
1469	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1530	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470	$self->{layout}->set_text ($text);	1531	$self->{layout}->set_text ($text);
1471		1532
		1533	$self->realloc;
1472	$self->update;	1534	$self->update;
1473	$self->check_size;
1474	}	1535	}
1475		1536
1476	sub set_markup {	1537	sub set_markup {
1477	my ($self, $markup) = @_;	1538	my ($self, $markup) = @_;
1478		1539
…		…
1482	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1543	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483		1544
1484	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1545	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485	$self->{layout}->set_markup ($markup);	1546	$self->{layout}->set_markup ($markup);
1486		1547
		1548	$self->realloc;
1487	$self->update;	1549	$self->update;
1488	$self->check_size;
1489	}	1550	}
1490		1551
1491	sub size_request {	1552	sub size_request {
1492	my ($self) = @_;	1553	my ($self) = @_;
1493		1554
…		…
1507		1568
1508	$w = List::Util::max $w, $w2;	1569	$w = List::Util::max $w, $w2;
1509	$h = List::Util::max $h, $h2;	1570	$h = List::Util::max $h, $h2;
1510	}	1571	}
1511		1572
1512	(	1573	($w, $h)
1513	$w + $self->{padding} * 2,
1514	$h + $self->{padding} * 2,
1515	)
1516	}	1574	}
1517		1575
1518	sub size_allocate {	1576	sub size_allocate {
1519	my ($self, $w, $h) = @_;	1577	my ($self, $w, $h) = @_;
1520		1578
		1579	delete $self->{ox};
		1580
1521	delete $self->{texture};	1581	delete $self->{texture}
		1582	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522	}	1583	}
1523		1584
1524	sub set_fontsize {	1585	sub set_fontsize {
1525	my ($self, $fontsize) = @_;	1586	my ($self, $fontsize) = @_;
1526		1587
1527	$self->{fontsize} = $fontsize;	1588	$self->{fontsize} = $fontsize;
1528	delete $self->{texture};	1589	delete $self->{texture};
1529		1590
1530	$self->update;	1591	$self->realloc;
1531	$self->check_size;
1532	}	1592	}
1533		1593
1534	sub _draw {	1594	sub _draw {
1535	my ($self) = @_;	1595	my ($self) = @_;
1536		1596
…		…
1542	$self->{layout}->set_width ($self->{w});	1602	$self->{layout}->set_width ($self->{w});
1543	$self->{layout}->set_ellipsise ($self->{ellipsise});	1603	$self->{layout}->set_ellipsise ($self->{ellipsise});
1544	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1604	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1605	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546		1606
1547	my $tex = new_from_layout CFClient::Texture $self->{layout};	1607	new_from_layout CFClient::Texture $self->{layout}
		1608	};
1548		1609
		1610	unless (exists $self->{ox}) {
1549	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1611	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1612	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551	: ($self->{w} - $tex->{w}) * 0.5);	1613	: ($self->{w} - $tex->{w}) * 0.5);
1552		1614
1553	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1615	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1616	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555	: ($self->{h} - $tex->{h}) * 0.5);	1617	: ($self->{h} - $tex->{h}) * 0.5);
1556
1557	$tex
1558	};	1618	};
1559		1619
1560	glEnable GL_TEXTURE_2D;	1620	glEnable GL_TEXTURE_2D;
1561	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1621	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562		1622
…		…
1616	sub set_text {	1676	sub set_text {
1617	my ($self, $text) = @_;	1677	my ($self, $text) = @_;
1618		1678
1619	$self->{cursor} = length $text;	1679	$self->{cursor} = length $text;
1620	$self->_set_text ($text);	1680	$self->_set_text ($text);
1621	$self->update;	1681
1622	$self->check_size;	1682	$self->realloc;
1623	}	1683	}
1624		1684
1625	sub get_text {	1685	sub get_text {
1626	$_[0]{text}	1686	$_[0]{text}
1627	}	1687	}
…		…
1657	$self->{cursor} = length $text;	1717	$self->{cursor} = length $text;
1658	} elsif ($uni == 27) {	1718	} elsif ($uni == 27) {
1659	$self->_emit ('escape');	1719	$self->_emit ('escape');
1660	} elsif ($uni) {	1720	} elsif ($uni) {
1661	substr $text, $self->{cursor}++, 0, chr $uni;	1721	substr $text, $self->{cursor}++, 0, chr $uni;
		1722	} else {
		1723	return 0;
1662	}	1724	}
1663		1725
1664	$self->_set_text ($text);	1726	$self->_set_text ($text);
1665	$self->update;	1727
1666	$self->check_size;	1728	$self->realloc;
		1729
		1730	1
1667	}	1731	}
1668		1732
1669	sub focus_in {	1733	sub focus_in {
1670	my ($self) = @_;	1734	my ($self) = @_;
1671		1735
…		…
1686	utf8::encode $text;	1750	utf8::encode $text;
1687	$self->{cursor} = length substr $text, 0, $idx;	1751	$self->{cursor} = length substr $text, 0, $idx;
1688		1752
1689	$self->_set_text ($self->{text});	1753	$self->_set_text ($self->{text});
1690	$self->update;	1754	$self->update;
		1755
		1756	1
1691	}	1757	}
1692		1758
1693	sub mouse_motion {	1759	sub mouse_motion {
1694	my ($self, $ev, $x, $y) = @_;	1760	my ($self, $ev, $x, $y) = @_;
1695	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1761	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1762
		1763	0
1696	}	1764	}
1697		1765
1698	sub _draw {	1766	sub _draw {
1699	my ($self) = @_;	1767	my ($self) = @_;
1700		1768
…		…
1777	} else {	1845	} else {
1778	$self->set_text ($self->{history_saveback});	1846	$self->set_text ($self->{history_saveback});
1779	}	1847	}
1780		1848
1781	} else {	1849	} else {
1782	$self->SUPER::key_down ($ev);	1850	return $self->SUPER::key_down ($ev)
		1851	}
		1852
1783	}	1853	1
1784
1785	}	1854	}
1786		1855
1787	#############################################################################	1856	#############################################################################
1788		1857
1789	package CFClient::UI::Button;	1858	package CFClient::UI::Button;
…		…
1798		1867
1799	sub new {	1868	sub new {
1800	my $class = shift;	1869	my $class = shift;
1801		1870
1802	$class->SUPER::new (	1871	$class->SUPER::new (
1803	padding => 4,	1872	padding_x => 4,
		1873	padding_y => 4,
1804	fg => [1, 1, 1],	1874	fg => [1, 1, 1],
1805	active_fg => [0, 0, 1],	1875	active_fg => [0, 0, 1],
1806	can_hover => 1,	1876	can_hover => 1,
1807	align => 0,	1877	align => 0,
1808	valign => 0,	1878	valign => 0,
…		…
1817	my ($self, $ev, $x, $y) = @_;	1887	my ($self, $ev, $x, $y) = @_;
1818		1888
1819	$self->emit ("activate")	1889	$self->emit ("activate")
1820	if $x >= 0 && $x < $self->{w}	1890	if $x >= 0 && $x < $self->{w}
1821	&& $y >= 0 && $y < $self->{h};	1891	&& $y >= 0 && $y < $self->{h};
		1892
		1893	1
1822	}	1894	}
1823		1895
1824	sub _draw {	1896	sub _draw {
1825	my ($self) = @_;	1897	my ($self) = @_;
1826		1898
…		…
1855		1927
1856	sub new {	1928	sub new {
1857	my $class = shift;	1929	my $class = shift;
1858		1930
1859	$class->SUPER::new (	1931	$class->SUPER::new (
1860	padding => 2,	1932	padding_x => 2,
		1933	padding_y => 2,
1861	fg => [1, 1, 1],	1934	fg => [1, 1, 1],
1862	active_fg => [1, 1, 0],	1935	active_fg => [1, 1, 0],
1863	bg => [0, 0, 0, 0.2],	1936	bg => [0, 0, 0, 0.2],
1864	active_bg => [1, 1, 1, 0.5],	1937	active_bg => [1, 1, 1, 0.5],
1865	state => 0,	1938	state => 0,
…		…
1869	}	1942	}
1870		1943
1871	sub size_request {	1944	sub size_request {
1872	my ($self) = @_;	1945	my ($self) = @_;
1873		1946
1874	($self->{padding} * 2 + 6) x 2	1947	(6) x 2
1875	}	1948	}
1876		1949
1877	sub button_down {	1950	sub button_down {
1878	my ($self, $ev, $x, $y) = @_;	1951	my ($self, $ev, $x, $y) = @_;
1879		1952
1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1953	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1954	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882	$self->{state} = !$self->{state};	1955	$self->{state} = !$self->{state};
1883	$self->_emit (changed => $self->{state});	1956	$self->_emit (changed => $self->{state});
		1957	} else {
		1958	return 0
		1959	}
		1960
1884	}	1961	1
1885	}	1962	}
1886		1963
1887	sub _draw {	1964	sub _draw {
1888	my ($self) = @_;	1965	my ($self) = @_;
1889		1966
1890	$self->SUPER::_draw;	1967	$self->SUPER::_draw;
1891		1968
1892	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1969	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893		1970
1894	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1971	my ($w, $h) = @$self{qw(w h)};
		1972
		1973	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895		1974
1896	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1975	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897		1976
1898	my $tex = $self->{state} ? $tex[1] : $tex[0];	1977	my $tex = $self->{state} ? $tex[1] : $tex[0];
1899		1978
…		…
2164	fg => [1, 1, 1],	2243	fg => [1, 1, 1],
2165	active_fg => [0, 0, 0],	2244	active_fg => [0, 0, 0],
2166	bg => [0, 0, 0, 0.2],	2245	bg => [0, 0, 0, 0.2],
2167	active_bg => [1, 1, 1, 0.5],	2246	active_bg => [1, 1, 1, 0.5],
2168	range => [0, 0, 100, 10, 0],	2247	range => [0, 0, 100, 10, 0],
2169	req_w => $::WIDTH / 80,	2248	min_w => $::WIDTH / 80,
2170	req_h => $::WIDTH / 80,	2249	min_h => $::WIDTH / 80,
2171	vertical => 0,	2250	vertical => 0,
2172	can_hover => 1,	2251	can_hover => 1,
2173	inner_pad => 0.02,	2252	inner_pad => 0.02,
2174	@_	2253	@_
2175	);	2254	);
…		…
2178	$self->update;	2257	$self->update;
2179		2258
2180	$self	2259	$self
2181	}	2260	}
2182		2261
		2262	sub changed { }
		2263
2183	sub set_range {	2264	sub set_range {
2184	my ($self, $range) = @_;	2265	my ($self, $range) = @_;
2185		2266
2186	($range, $self->{range}) = ($self->{range}, $range);	2267	($range, $self->{range}) = ($self->{range}, $range);
2187		2268
…		…
2213	}	2294	}
2214		2295
2215	sub size_request {	2296	sub size_request {
2216	my ($self) = @_;	2297	my ($self) = @_;
2217		2298
2218	my $w = $self->{req_w};	2299	($self->{req_w}, $self->{req_h})
2219	my $h = $self->{req_h};
2220
2221	$self->{vertical} ? ($h, $w) : ($w, $h)
2222	}	2300	}
2223		2301
2224	sub button_down {	2302	sub button_down {
2225	my ($self, $ev, $x, $y) = @_;	2303	my ($self, $ev, $x, $y) = @_;
2226		2304
2227	$self->SUPER::button_down ($ev, $x, $y);	2305	$self->SUPER::button_down ($ev, $x, $y);
2228		2306
2229	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2307	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2230		2308
2231	$self->mouse_motion ($ev, $x, $y);	2309	$self->mouse_motion ($ev, $x, $y)
2232	}	2310	}
2233		2311
2234	sub mouse_motion {	2312	sub mouse_motion {
2235	my ($self, $ev, $x, $y) = @_;	2313	my ($self, $ev, $x, $y) = @_;
2236		2314
…		…
2240	my (undef, $lo, $hi, $page) = @{$self->{range}};	2318	my (undef, $lo, $hi, $page) = @{$self->{range}};
2241		2319
2242	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2320	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2243		2321
2244	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2322	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2323	} else {
		2324	return 0;
		2325	}
		2326
2245	}	2327	1
2246	}	2328	}
2247		2329
2248	sub update {	2330	sub update {
2249	my ($self) = @_;	2331	my ($self) = @_;
2250		2332
…		…
2611	}	2693	}
2612		2694
2613	sub set_tooltip_from {	2695	sub set_tooltip_from {
2614	my ($self, $widget) = @_;	2696	my ($self, $widget) = @_;
2615		2697
		2698	my $tooltip = $widget->{tooltip};
		2699
		2700	if ($ENV{CFPLUS_DEBUG} & 2) {
		2701	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2702	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2703	. "req $widget->{req_w} $widget->{req_h}\n"
		2704	. "visible $widget->{visible}";
		2705	}
		2706
2616	$self->add (new CFClient::UI::Label	2707	$self->add (new CFClient::UI::Label
2617	markup => $widget->{tooltip},	2708	markup => $tooltip,
2618	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2709	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619	fontsize => 0.8,	2710	fontsize => 0.8,
2620	fg => [0, 0, 0, 1],	2711	fg => [0, 0, 0, 1],
2621	ellipsise => 0,	2712	ellipsise => 0,
2622	font => ($widget->{tooltip_font} || $::FONT_PROP),	2713	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2633		2724
2634	sub size_allocate {	2725	sub size_allocate {
2635	my ($self, $w, $h) = @_;	2726	my ($self, $w, $h) = @_;
2636		2727
2637	$self->SUPER::size_allocate ($w - 4, $h - 4);	2728	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2729	}
		2730
		2731	sub visibility_change {
		2732	my ($self, $visible) = @_;
		2733
		2734	return unless $visible;
		2735
		2736	$self->{root}->on_post_alloc ("move_$self" => sub {
		2737	my $widget = $self->{owner}
		2738	or return;
		2739
		2740	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2741
		2742	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2743	if $x + $self->{w} > $::WIDTH;
		2744
		2745	$self->move_abs ($x, $y);
		2746	});
2638	}	2747	}
2639		2748
2640	sub _draw {	2749	sub _draw {
2641	my ($self) = @_;	2750	my ($self) = @_;
2642		2751
…		…
2659	glVertex $w, $h;	2768	glVertex $w, $h;
2660	glVertex $w, 0;	2769	glVertex $w, 0;
2661	glEnd;	2770	glEnd;
2662		2771
2663	glTranslate 2 - 0.375, 2 - 0.375;	2772	glTranslate 2 - 0.375, 2 - 0.375;
		2773
2664	$self->SUPER::_draw;	2774	$self->SUPER::_draw;
2665	}	2775	}
2666		2776
2667	#############################################################################	2777	#############################################################################
2668		2778
…		…
2744	$self->SUPER::DESTROY;	2854	$self->SUPER::DESTROY;
2745	}	2855	}
2746		2856
2747	#############################################################################	2857	#############################################################################
2748		2858
2749	package CFClient::UI::Inventory;
2750
2751	our @ISA = CFClient::UI::ScrolledWindow::;
2752
2753	sub new {
2754	my $class = shift;
2755
2756	my $self = $class->SUPER::new (
2757	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2758	@_,
2759	);
2760
2761	$self
2762	}
2763
2764	sub set_items {
2765	my ($self, $items) = @_;
2766
2767	$self->{scrolled}->clear;
2768	return unless $items;
2769
2770	my @items = sort {
2771	($a->{type} <=> $b->{type})
2772	or ($a->{name} cmp $b->{name})
2773	} @$items;
2774
2775	$self->{real_items} = \@items;
2776
2777	my $row = 0;
2778	for my $item (@items) {
2779	CFClient::Item::update_widgets $item;
2780
2781	$self->{scrolled}->add (0, $row, $item->{face_widget});
2782	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2783	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2784
2785	$row++;
2786	}
2787	}
2788
2789	#############################################################################
2790
2791	package CFClient::UI::Menu;	2859	package CFClient::UI::Menu;
2792		2860
2793	our @ISA = CFClient::UI::FancyFrame::;	2861	our @ISA = CFClient::UI::FancyFrame::;
2794		2862
2795	use CFClient::OpenGL;	2863	use CFClient::OpenGL;
…		…
2833	# maybe save $GRAB? must be careful about events...	2901	# maybe save $GRAB? must be careful about events...
2834	$GRAB = $self;	2902	$GRAB = $self;
2835	$self->{button} = $ev->{button};	2903	$self->{button} = $ev->{button};
2836		2904
2837	$self->show;	2905	$self->show;
2838	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2906	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2839	}	2907	}
2840		2908
2841	sub mouse_motion {	2909	sub mouse_motion {
2842	my ($self, $ev, $x, $y) = @_;	2910	my ($self, $ev, $x, $y) = @_;
2843		2911
2844	# TODO: should use vbox->find_widget or so	2912	# TODO: should use vbox->find_widget or so
2845	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2913	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2846	$self->{hover} = $self->{item}{$HOVER};	2914	$self->{hover} = $self->{item}{$HOVER};
		2915
		2916	0
2847	}	2917	}
2848		2918
2849	sub button_up {	2919	sub button_up {
2850	my ($self, $ev, $x, $y) = @_;	2920	my ($self, $ev, $x, $y) = @_;
2851		2921
…		…
2853	undef $GRAB;	2923	undef $GRAB;
2854	$self->hide;	2924	$self->hide;
2855		2925
2856	$self->_emit ("popdown");	2926	$self->_emit ("popdown");
2857	$self->{hover}[1]->() if $self->{hover};	2927	$self->{hover}[1]->() if $self->{hover};
		2928	} else {
		2929	return 0
		2930	}
		2931
2858	}	2932	1
2859	}	2933	}
2860		2934
2861	#############################################################################	2935	#############################################################################
2862		2936
2863	package CFClient::UI::Statusbox;	2937	package CFClient::UI::Statusbox;
…		…
2968	$self->SUPER::reconfigure;	3042	$self->SUPER::reconfigure;
2969	}	3043	}
2970		3044
2971	#############################################################################	3045	#############################################################################
2972		3046
2973	package CFClient::UI::Root;	3047	package CFClient::UI::Inventory;
2974		3048
2975	our @ISA = CFClient::UI::Container::;	3049	our @ISA = CFClient::UI::ScrolledWindow::;
2976
2977	use CFClient::OpenGL;
2978		3050
2979	sub new {	3051	sub new {
2980	my $class = shift;	3052	my $class = shift;
2981		3053
2982	$class->SUPER::new (	3054	my $self = $class->SUPER::new (
		3055	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3056	@_,
		3057	);
		3058
		3059	$self
		3060	}
		3061
		3062	sub set_items {
		3063	my ($self, $items) = @_;
		3064
		3065	$self->{scrolled}->clear;
		3066	return unless $items;
		3067
		3068	my @items = sort {
		3069	($a->{type} <=> $b->{type})
		3070	or ($a->{name} cmp $b->{name})
		3071	} @$items;
		3072
		3073	$self->{real_items} = \@items;
		3074
		3075	my $row = 0;
		3076	for my $item (@items) {
		3077	CFClient::Item::update_widgets $item;
		3078
		3079	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3080	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3081	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3082
		3083	$row++;
		3084	}
		3085	}
		3086
		3087	#############################################################################
		3088
		3089	package CFClient::UI::BindEditor;
		3090
		3091	our @ISA = CFClient::UI::FancyFrame::;
		3092
		3093	sub new {
		3094	my $class = shift;
		3095
		3096	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3097
		3098	$self->add (my $vb = new CFClient::UI::VBox);
		3099
		3100
		3101	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3102	text => "start recording",
		3103	tooltip => "Start/Stops recording of actions."
		3104	."All subsequent actions after the recording started will be captured."
		3105	."The actions are displayed after the record was stopped."
		3106	."To bind the action you have to click on the 'Bind' button",
		3107	on_activate => sub {
		3108	unless ($self->{recording}) {
		3109	$self->start;
		3110	} else {
		3111	$self->stop;
		3112	}
		3113	});
		3114
		3115	$vb->add (new CFClient::UI::Label text => "Actions:");
		3116	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3117
		3118	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3119	$vb->add (my $hb = new CFClient::UI::HBox);
		3120	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3121	$hb->add (new CFClient::UI::Button
		3122	text => "bind",
		3123	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3124	on_activate => sub {
		3125	$self->ask_for_bind;
		3126	});
		3127
		3128	$vb->add (my $hb = new CFClient::UI::HBox);
		3129	$hb->add (new CFClient::UI::Button
		3130	text => "ok",
		3131	expand => 1,
		3132	tooltip => "This closes the binding editor and saves the binding",
		3133	on_activate => sub {
		3134	$self->hide;
		3135	$self->commit;
		3136	});
		3137
		3138	$hb->add (new CFClient::UI::Button
		3139	text => "cancel",
		3140	expand => 1,
		3141	tooltip => "This closes the binding editor without saving",
		3142	on_activate => sub {
		3143	$self->hide;
		3144	$self->{binding_cancel}->()
		3145	if $self->{binding_cancel};
		3146	});
		3147
		3148	$self->update_binding_widgets;
		3149
		3150	$self
		3151	}
		3152
		3153	sub commit {
		3154	my ($self) = @_;
		3155	my ($mod, $sym, $cmds) = $self->get_binding;
		3156	if ($sym != 0 && @$cmds > 0) {
		3157	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3158	."'. Don't forget 'Save Config'!");
		3159	$self->{binding_change}->($mod, $sym, $cmds)
		3160	if $self->{binding_change};
		3161	} else {
		3162	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3163	$self->{binding_cancel}->()
		3164	if $self->{binding_cancel};
		3165	}
		3166	}
		3167
		3168	sub start {
		3169	my ($self) = @_;
		3170
		3171	$self->{rec_btn}->set_text ("stop recording");
		3172	$self->{recording} = 1;
		3173	$self->clear_command_list;
		3174	$::CONN->start_record if $::CONN;
		3175	}
		3176
		3177	sub stop {
		3178	my ($self) = @_;
		3179
		3180	$self->{rec_btn}->set_text ("start recording");
		3181	$self->{recording} = 0;
		3182
		3183	my $rec;
		3184	$rec = $::CONN->stop_record if $::CONN;
		3185	return unless ref $rec eq 'ARRAY';
		3186	$self->set_command_list ($rec);
		3187	}
		3188
		3189
		3190	sub ask_for_bind_and_commit {
		3191	my ($self) = @_;
		3192	$self->ask_for_bind (1);
		3193	}
		3194
		3195	sub ask_for_bind {
		3196	my ($self, $commit) = @_;
		3197
		3198	CFClient::Binder::open_binding_dialog (sub {
		3199	my ($mod, $sym) = @_;
		3200	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3201	$self->update_binding_widgets;
		3202	$self->commit if $commit;
		3203	});
		3204	}
		3205
		3206	# $mod and $sym are the modifiers and key symbol
		3207	# $cmds is a array ref of strings (the commands)
		3208	# $cb is the callback that is executed on OK
		3209	# $ccb is the callback that is executed on CANCEL and
		3210	# when the binding was unsuccessful on OK
		3211	sub set_binding {
		3212	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3213
		3214	$self->clear_command_list;
		3215	$self->{recording} = 0;
		3216	$self->{rec_btn}->set_text ("start recording");
		3217
		3218	$self->{binding} = [$mod, $sym];
		3219	$self->{commands} = $cmds;
		3220
		3221	$self->{binding_change} = $cb;
		3222	$self->{binding_cancel} = $ccb;
		3223
		3224	$self->update_binding_widgets;
		3225	}
		3226
		3227	# this is a shortcut method that asks for a binding
		3228	# and then just binds it.
		3229	sub do_quick_binding {
		3230	my ($self, $cmds) = @_;
		3231	$self->set_binding (undef, undef, $cmds, sub {
		3232	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3233	});
		3234	$self->ask_for_bind (1);
		3235	}
		3236
		3237	sub update_binding_widgets {
		3238	my ($self) = @_;
		3239	my ($mod, $sym, $cmds) = $self->get_binding;
		3240	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3241	$self->set_command_list ($cmds);
		3242	}
		3243
		3244	sub get_binding {
		3245	my ($self) = @_;
		3246	return (
		3247	$self->{binding}->[0],
		3248	$self->{binding}->[1],
		3249	[ grep { defined $_ } @{$self->{commands}} ]
		3250	);
		3251	}
		3252
		3253	sub clear_command_list {
		3254	my ($self) = @_;
		3255	$self->{cmdbox}->clear ();
		3256	}
		3257
		3258	sub set_command_list {
		3259	my ($self, $cmds) = @_;
		3260
		3261	$self->{cmdbox}->clear ();
		3262	$self->{commands} = $cmds;
		3263
		3264	my $idx = 0;
		3265
		3266	for (@$cmds) {
		3267	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3268
		3269	my $i = $idx;
		3270	$hb->add (new CFClient::UI::Label text => $_);
		3271	$hb->add (new CFClient::UI::Button
		3272	text => "delete",
		3273	tooltip => "Deletes the action from the record",
		3274	on_activate => sub {
		3275	$self->{cmdbox}->remove ($hb);
		3276	$cmds->[$i] = undef;
		3277	});
		3278
		3279
		3280	$idx++
		3281	}
		3282	}
		3283
		3284	#############################################################################
		3285
		3286	package CFClient::UI::SpellList;
		3287
		3288	our @ISA = CFClient::UI::FancyFrame::;
		3289
		3290	sub new {
		3291	my $class = shift;
		3292
		3293	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3294
		3295	$self->add (new CFClient::UI::ScrolledWindow
		3296	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3297
		3298	$self;
		3299	}
		3300
		3301	# XXX: Do sorting? Argl...
		3302	sub add_spell {
		3303	my ($self, $spell) = @_;
		3304	$self->{spells}->{$spell->{name}} = $spell;
		3305
		3306	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3307	face => $spell->{face},
		3308	can_hover => 1,
		3309	can_events => 1,
		3310	tooltip => $spell->{message});
		3311
		3312	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3313	text => $spell->{name},
		3314	can_hover => 1,
		3315	can_events => 1,
		3316	tooltip => $spell->{message},
		3317	expand => 1);
		3318
		3319	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3320	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3321	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3322	expand => 1);
		3323
		3324	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3325	text => "bind to key",
		3326	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3327	}
		3328
		3329	sub rebuild_spell_list {
		3330	my ($self) = @_;
		3331	$self->{tbl_idx} = 0;
		3332	$self->add_spell ($_) for values %{$self->{spells}};
		3333	}
		3334
		3335	sub remove_spell {
		3336	my ($self, $spell) = @_;
		3337	delete $self->{spells}->{$spell->{name}};
		3338	$self->rebuild_spell_list;
		3339	}
		3340
		3341	#############################################################################
		3342
		3343	package CFClient::UI::Root;
		3344
		3345	our @ISA = CFClient::UI::Container::;
		3346
		3347	use CFClient::OpenGL;
		3348
		3349	sub new {
		3350	my $class = shift;
		3351
		3352	my $self = $class->SUPER::new (
2983	visible => 1,	3353	visible => 1,
2984	@_,	3354	@_,
2985	)	3355	);
2986	}
2987		3356
2988	sub configure {	3357	Scalar::Util::weaken ($self->{root} = $self);
2989	my ($self, $x, $y, $w, $h) = @_;
2990		3358
2991	$self->{w} = $w;	3359	$self
2992	$self->{h} = $h;
2993	}
2994
2995	sub check_size {
2996	my ($self) = @_;
2997
2998	$self->size_allocate ($self->{w}, $self->{h})
2999	if $self->{w};
3000	}	3360	}
3001		3361
3002	sub size_request {	3362	sub size_request {
3003	my ($self) = @_;	3363	my ($self) = @_;
3004		3364
3005	($self->{w}, $self->{h})	3365	($self->{w}, $self->{h})
		3366	}
		3367
		3368	sub _to_pixel {
		3369	my ($coord, $size, $max) = @_;
		3370
		3371	$coord =
		3372	$coord eq "center" ? ($max - $size) * 0.5
		3373	: $coord eq "max" ? $max
		3374	: $coord;
		3375
		3376	$coord = 0 if $coord < 0;
		3377	$coord = $max - $size if $coord > $max - $size;
		3378
		3379	int $coord + 0.5
3006	}	3380	}
3007		3381
3008	sub size_allocate {	3382	sub size_allocate {
3009	my ($self, $w, $h) = @_;	3383	my ($self, $w, $h) = @_;
3010		3384
3011	for my $child ($self->children) {	3385	for my $child ($self->children) {
3012	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3386	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3013		3387
3014	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3388	$X = $child->{force_x} if exists $child->{force_x};
3015	if exists $child->{req_x};	3389	$Y = $child->{force_y} if exists $child->{force_y};
3016		3390
3017	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3391	$X = _to_pixel $X, $W, $self->{w};
3018	if exists $child->{req_y};	3392	$Y = _to_pixel $Y, $H, $self->{h};
3019
3020	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
3022	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3023	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3024		3393
3025	$child->configure ($X, $Y, $W, $H);	3394	$child->configure ($X, $Y, $W, $H);
3026	}	3395	}
3027	}	3396	}
3028		3397
…		…
3039	}	3408	}
3040		3409
3041	sub update {	3410	sub update {
3042	my ($self) = @_;	3411	my ($self) = @_;
3043		3412
3044	$self->check_size;
3045	$::WANT_REFRESH++;	3413	$::WANT_REFRESH++;
3046	}	3414	}
3047		3415
3048	sub add {	3416	sub add {
3049	my ($self, @children) = @_;	3417	my ($self, @children) = @_;
3050		3418
3051	for my $child (@children) {
3052	$child->{is_toplevel} = 1;	3419	$_->{is_toplevel} = 1
3053		3420	for @children;
3054	# integerise window positions
3055	$child->{x} = int $child->{x};
3056	$child->{y} = int $child->{y};
3057	}
3058		3421
3059	$self->SUPER::add (@children);	3422	$self->SUPER::add (@children);
3060
3061	for (my @widgets = @children; my $w = pop @widgets; ) {
3062	push @widgets, $w->children;
3063	$w->set_visible;
3064	}
3065
3066	}	3423	}
3067		3424
3068	sub remove {	3425	sub remove {
3069	my ($self, @children) = @_;	3426	my ($self, @children) = @_;
3070		3427
3071	$self->SUPER::remove (@children);	3428	$self->SUPER::remove (@children);
		3429
		3430	delete $self->{is_toplevel}
		3431	for @children;
3072		3432
3073	while (@children) {	3433	while (@children) {
3074	my $w = pop @children;	3434	my $w = pop @children;
3075	push @children, $w->children;	3435	push @children, $w->children;
3076	$w->set_invisible;	3436	$w->set_invisible;
…		…
3095	while ($self->{refresh_hook}) {	3455	while ($self->{refresh_hook}) {
3096	$_->()	3456	$_->()
3097	for values %{delete $self->{refresh_hook}};	3457	for values %{delete $self->{refresh_hook}};
3098	}	3458	}
3099		3459
3100	if ($self->{check_size}) {	3460	if ($self->{realloc}) {
		3461	my %queue;
3101	my @queue;	3462	my @queue;
		3463	my $widget;
3102		3464
		3465	outer:
3103	while () {	3466	while () {
3104	if ($self->{check_size}) {	3467	if (my $realloc = delete $self->{realloc}) {
3105	#TODO use array-of-depth approach	3468	for $widget (values %$realloc) {
		3469	$widget->{visible} or next; # do not resize invisible widgets
3106		3470
3107	@queue = sort { $a->{visible} <=> $b->{visible} }	3471	$queue{$widget+0}++ and next; # duplicates are common
3108	@queue, values %{delete $self->{check_size}};	3472
		3473	push @{ $queue[$widget->{visible}] }, $widget;
		3474	}
3109	}	3475	}
3110		3476
		3477	while () {
		3478	@queue or last outer;
		3479
3111	my $widget = pop @queue || last;	3480	$widget = pop @{ $queue[-1] || [] }
3112		3481	and last;
3113	defined $widget->{visible} or last; # do not resize invisible widgets
3114
3115	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3116	? @$widget{qw(def_w def_h)}
3117	: $widget->size_request;
3118
3119	if (delete $widget->{force_alloc}
3120	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3121	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3122		3482
		3483	pop @queue;
		3484	}
		3485
		3486	delete $queue{$widget+0};
		3487
		3488	my ($w, $h) = $widget->size_request;
		3489
		3490	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3491	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3492
		3493	$w = $widget->{force_w} if exists $widget->{force_w};
		3494	$h = $widget->{force_h} if exists $widget->{force_h};
		3495
		3496	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3497	|| delete $widget->{force_realloc}) {
3123	$widget->{req_w} = $w;	3498	$widget->{req_w} = $w;
3124	$widget->{req_h} = $h;	3499	$widget->{req_h} = $h;
3125		3500
3126	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3501	$self->{size_alloc}{$widget+0} = $widget;
3127		3502
3128	$widget->{parent}->check_size
3129	if $widget->{parent};	3503	if (my $parent = $widget->{parent}) {
		3504	$self->{realloc}{$parent+0} = $parent
		3505	unless $queue{$parent+0};
		3506
		3507	$parent->{force_size_alloc} = 1;
		3508	$self->{size_alloc}{$parent+0} = $parent;
		3509	}
3130	}	3510	}
		3511
		3512	delete $self->{realloc}{$widget+0};
3131	}	3513	}
3132	}	3514	}
3133		3515
3134	while (my $size_alloc = delete $self->{size_alloc}) {	3516	while (my $size_alloc = delete $self->{size_alloc}) {
3135	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3517	my @queue = sort { $b->{visible} <=> $a->{visible} }
3136	values %$size_alloc;	3518	values %$size_alloc;
3137		3519
3138	while () {	3520	while () {
3139	my ($widget, $w, $h) = @{ pop @queue or last };	3521	my $widget = pop @queue || last;
		3522
		3523	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3140		3524
3141	$w = 0 if $w < 0;	3525	$w = 0 if $w < 0;
3142	$h = 0 if $h < 0;	3526	$h = 0 if $h < 0;
3143		3527
		3528	$w = int $w + 0.5;
		3529	$h = int $h + 0.5;
		3530
		3531	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3532	$widget->{old_w} = $widget->{w};
		3533	$widget->{old_h} = $widget->{h};
		3534
3144	$widget->{w} = $w;	3535	$widget->{w} = $w;
3145	$widget->{h} = $h;	3536	$widget->{h} = $h;
		3537
3146	$widget->emit (size_allocate => $w, $h);	3538	$widget->emit (size_allocate => $w, $h);
		3539	}
3147	}	3540	}
3148	}	3541	}
3149		3542
3150	while ($self->{post_alloc_hook}) {	3543	while ($self->{post_alloc_hook}) {
3151	$_->()	3544	$_->()
3152	for values %{delete $self->{post_alloc_hook}};	3545	for values %{delete $self->{post_alloc_hook}};
3153	}	3546	}
		3547
3154		3548
3155	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3549	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3156	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3550	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3157	glClear GL_COLOR_BUFFER_BIT;	3551	glClear GL_COLOR_BUFFER_BIT;
3158		3552
…		…
3160	glLoadIdentity;	3554	glLoadIdentity;
3161	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3555	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3162	glMatrixMode GL_MODELVIEW;	3556	glMatrixMode GL_MODELVIEW;
3163	glLoadIdentity;	3557	glLoadIdentity;
3164		3558
		3559	{
		3560	package CFClient::UI::Base;
		3561
		3562	($draw_x, $draw_y, $draw_w, $draw_h) =
		3563	(0, 0, $self->{w}, $self->{h});
		3564	}
		3565
3165	$self->_draw;	3566	$self->_draw;
3166	}	3567	}
3167		3568
3168	#############################################################################	3569	#############################################################################
3169		3570

Diff Legend

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