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.252 by root, Sun May 28 23:21:28 2006 UTC vs.
Revision 1.272 by root, Sat Jun 3 01:47:14 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
53	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
54
55	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
56	if $x + $TOOLTIP->{w} > $::WIDTH;
57
58	$TOOLTIP->move ($x, $y);
59	$TOOLTIP->show;	60	$TOOLTIP->show;
60	}	61	}
61		62
62	return;	63	return;
63	}	64	}
…		…
170	sub rescale_widgets {	171	sub rescale_widgets {
171	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
172		173
173	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
174	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
175	$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.]+$/;
176	$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};
177	$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};
178	$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.]+$/;
179	$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};
180	$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
181	}	189	}
182	}	190	}
183		191
184	reconfigure_widgets;	192	reconfigure_widgets;
185	}	193	}
…		…
194		202
195	sub new {	203	sub new {
196	my $class = shift;	204	my $class = shift;
197		205
198	my $self = bless {	206	my $self = bless {
199	x => 0,	207	x => "center",
200	y => 0,	208	y => "center",
201	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
202	can_events => 1,	212	can_events => 1,
203	@_	213	@_
204	}, $class;	214	}, $class;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
205		217
206	for (keys %$self) {	218	for (keys %$self) {
207	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
208	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
209	}	221	}
210	}	222	}
211		223
212	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
213
214	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
215	$self->{req_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
216	$self->{req_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
217	$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};
218	$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};
219	}	234	}
220		235
221	$self	236	$self
222	}	237	}
223		238
…		…
232	my ($self) = @_;	247	my ($self) = @_;
233		248
234	return if $self->{parent};	249	return if $self->{parent};
235		250
236	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
237	}
238
239	sub center {
240	my ($self) = @_;
241
242	$CFClient::UI::ROOT->on_post_alloc (
243	"center_$self" => sub {
244	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
245	},
246	);
247
248	$self->update;
249	}	252	}
250		253
251	sub set_visible {	254	sub set_visible {
252	my ($self) = @_;	255	my ($self) = @_;
253		256
…		…
308		311
309	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
310	if $self->{parent};	313	if $self->{parent};
311	}	314	}
312		315
313	sub move {	316	sub move_abs {
314	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
315		318
316	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
317	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
318	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
319		322
320	$self->update;	323	$self->update;
321	}	324	}
322		325
323	sub set_size {	326	sub set_size {
324	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
325		328
326	$self->{def_w} = $w;	329	$self->{force_w} = $w;
327	$self->{def_h} = $h;	330	$self->{force_h} = $h;
328		331
329	$self->realloc;	332	$self->realloc;
330	}	333	}
331		334
332	sub size_request {	335	sub size_request {
…		…
336		339
337	sub configure {	340	sub configure {
338	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
339		342
340	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
341	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
342	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
343		348
344	# use alignment to adjust x, y	349	# use alignment to adjust x, y
345		350
346	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
347	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
348
349	($w, $h) = ($w2, $h2);
350	}	353	}
351		354
352	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
353	$self->{x} = $x;	356	$self->{x} = $x;
354	$self->{y} = $y;	357	$self->{y} = $y;
355	$self->update;	358	$self->update;
356	}	359	}
357		360
358	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
359	return unless $self->{visible};	362	return unless $self->{visible};
360		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
361	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	367	$self->{root}{size_alloc}{$self+0} = $self;
362	}	368	}
363	}	369	}
364		370
365	sub size_allocate {	371	sub size_allocate {
366	# nothing to be done	372	# nothing to be done
367	}	373	}
368		374
369	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
370	}	381	}
371		382
372	sub set_max_size {	383	sub set_max_size {
373	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
374		385
…		…
433		444
434	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
435	unless $FOCUS;	446	unless $FOCUS;
436	}	447	}
437		448
438	sub mouse_motion { }	449	sub mouse_motion { 0 }
439	sub button_up { }	450	sub button_up { 0 }
440	sub key_down { }	451	sub key_down { 0 }
441	sub key_up { }	452	sub key_up { 0 }
442		453
443	sub button_down {	454	sub button_down {
444	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
445		456
446	$self->focus_in;	457	$self->focus_in;
447	}
448		458
449	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
450	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
451	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
452	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
453	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
454		461
455	sub find_widget {	462	sub find_widget {
456	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
457		464
458	return () unless $self->{can_events};	465	return () unless $self->{can_events};
…		…
466		473
467	sub set_parent {	474	sub set_parent {
468	my ($self, $parent) = @_;	475	my ($self, $parent) = @_;
469		476
470	Scalar::Util::weaken ($self->{parent} = $parent);	477	Scalar::Util::weaken ($self->{parent} = $parent);
471
472	$self->set_visible if $parent->{visible};	478	$self->set_visible if $parent->{visible};
473	}	479	}
474		480
475	sub connect {	481	sub connect {
476	my ($self, $signal, $cb) = @_;	482	my ($self, $signal, $cb) = @_;
…		…
497		503
498	sub realloc {	504	sub realloc {
499	my ($self) = @_;	505	my ($self) = @_;
500		506
501	if ($self->{visible}) {	507	if ($self->{visible}) {
502	return if $self->{root}{realloc}{$self};	508	return if $self->{root}{realloc}{$self+0};
503		509
504	$self->{root}{realloc}{$self} = $self;	510	$self->{root}{realloc}{$self+0} = $self;
505	$self->{root}->update;	511	$self->{root}->update;
506	} else {	512	} else {
507	delete $self->{req_w};	513	delete $self->{req_w};
		514	delete $self->{req_h};
508	}	515	}
509	}	516	}
510		517
511	sub update {	518	sub update {
512	my ($self) = @_;	519	my ($self) = @_;
513		520
514	$self->{parent}->update	521	$self->{parent}->update
515	if $self->{parent};	522	if $self->{parent};
516	}	523	}
517		524
		525	sub reconfigure {
		526	my ($self) = @_;
		527
		528	$self->realloc;
		529	$self->update;
		530	}
		531
		532	# using global variables seems a bit hacky, but passing through all drawing
		533	# functions seems pointless.
		534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		535
518	sub draw {	536	sub draw {
519	my ($self) = @_;	537	my ($self) = @_;
520		538
521	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
		540
		541	# update screen rectangle
		542	local $draw_x = $draw_x + $self->{x};
		543	local $draw_y = $draw_y + $self->{y};
		544	local $draw_w = $draw_x + $self->{w};
		545	local $draw_h = $draw_y + $self->{h};
		546
		547	# skip widgets that are entirely outside the drawing area
		548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
522		550
523	glPushMatrix;	551	glPushMatrix;
524	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
525	$self->_draw;	553	$self->_draw;
526	glPopMatrix;	554	glPopMatrix;
…		…
538	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
539	glEnd;	567	glEnd;
540	glDisable GL_BLEND;	568	glDisable GL_BLEND;
541	}	569	}
542		570
543	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
544	glPushMatrix;	572	glPushMatrix;
545	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
546	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
547	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
548	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
624	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
625	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
626	}	654	}
627		655
628	sub size_request {	656	sub size_request {
629	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
630	}	660	}
631		661
632	sub draw { }	662	sub draw { }
633		663
634	#############################################################################	664	#############################################################################
…		…
638	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
639		669
640	sub new {	670	sub new {
641	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
642		672
643	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
644		674
645	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
646	children => [],	676	children => [],
647	can_events => 0,	677	can_events => 0,
648	%arg,	678	%arg,
649	);	679	);
		680
650	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
651		683
652	$self	684	$self
653	}	685	}
654		686
655	sub add {	687	sub add {
…		…
703	$x -= $self->{x};	735	$x -= $self->{x};
704	$y -= $self->{y};	736	$y -= $self->{y};
705		737
706	my $res;	738	my $res;
707		739
708	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
709	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
710	and return $res;	742	and return $res;
711	}	743	}
712		744
713	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
755	sub size_request {	787	sub size_request {
756	$_[0]{children}[0]->size_request	788	$_[0]{children}[0]->size_request
757	}	789	}
758		790
759	sub size_allocate {	791	sub size_allocate {
760	my ($self, $w, $h, $changed) = @_;	792	my ($self, $w, $h) = @_;
761		793
762	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
763	}	795	}
764		796
765	#############################################################################	797	#############################################################################
…		…
782	$ROOT->on_post_alloc ($self => sub { $self->render_child });	814	$ROOT->on_post_alloc ($self => sub { $self->render_child });
783	$self->SUPER::update;	815	$self->SUPER::update;
784	}	816	}
785		817
786	sub size_allocate {	818	sub size_allocate {
787	my ($self, $w, $h, $changed) = @_;	819	my ($self, $w, $h) = @_;
788		820
789	$self->SUPER::size_allocate ($w, $h, $changed);	821	$self->SUPER::size_allocate ($w, $h);
790	$self->update	822	$self->update;
791	if $changed;
792	}	823	}
793		824
794	sub _render {	825	sub _render {
		826	my ($self) = @_;
		827
795	$_[0]{children}[0]->draw;	828	$self->{children}[0]->draw;
796	}	829	}
797		830
798	sub render_child {	831	sub render_child {
799	my ($self) = @_;	832	my ($self) = @_;
800		833
801	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
802	glClearColor 0, 0, 0, 0;	835	glClearColor 0, 0, 0, 0;
803	glClear GL_COLOR_BUFFER_BIT;	836	glClear GL_COLOR_BUFFER_BIT;
804		837
		838	{
		839	package CFClient::UI::Base;
		840
		841	($draw_x, $draw_y, $draw_w, $draw_h) =
		842	(0, 0, $self->{w}, $self->{h});
		843	}
		844
805	$self->_render;	845	$self->_render;
806	};	846	};
807	}	847	}
808		848
809	sub _draw {	849	sub _draw {
810	my ($self) = @_;	850	my ($self) = @_;
811		851
812	my ($w, $h) = ($self->w, $self->h);	852	my ($w, $h) = @$self{qw(w h)};
813		853
814	my $tex = $self->{texture}	854	my $tex = $self->{texture}
815	or return;	855	or return;
816		856
817	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
…		…
840	}	880	}
841		881
842	sub size_request {	882	sub size_request {
843	my ($self) = @_;	883	my ($self) = @_;
844		884
845	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
846		886
847	$w = 10 if $self->{scroll_x};	887	$w = 10 if $self->{scroll_x};
848	$h = 10 if $self->{scroll_y};	888	$h = 10 if $self->{scroll_y};
849		889
850	($w, $h)	890	($w, $h)
851	}	891	}
852		892
853	sub size_allocate {	893	sub size_allocate {
854	my ($self, $w, $h, $changed) = @_;	894	my ($self, $w, $h) = @_;
855		895
		896	my $child = $self->child;
		897
856	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
857	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
858		900
859	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
860	$self->update;	902	$self->update;
861	}	903	}
862		904
…		…
897	}	939	}
898	}	940	}
899		941
900	sub _render {	942	sub _render {
901	my ($self) = @_;	943	my ($self) = @_;
		944
		945	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		946	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
902		947
903	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	948	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
904		949
905	$self->SUPER::_render;	950	$self->SUPER::_render;
906	}	951	}
…		…
946	my $child = $self->{vp}->child;	991	my $child = $self->{vp}->child;
947	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	992	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
948	}	993	}
949		994
950	sub size_allocate {	995	sub size_allocate {
951	my ($self, $w, $h, $changed) = @_;	996	my ($self, $w, $h) = @_;
952		997
953	$self->SUPER::size_allocate ($w, $h, $changed);	998	$self->SUPER::size_allocate ($w, $h);
954		999
955	my $child = $self->{vp}->child;	1000	my $child = $self->{vp}->child;
956	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
957	}	1002	}
958		1003
…		…
1005		1050
1006	our @ISA = CFClient::UI::Bin::;	1051	our @ISA = CFClient::UI::Bin::;
1007		1052
1008	use CFClient::OpenGL;	1053	use CFClient::OpenGL;
1009		1054
1010	my @tex =	1055	my $bg =
		1056	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1057	mipmap => 1, wrap => 1;
		1058
		1059	my @border =
1011	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1060	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1012	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1061	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1013		1062
1014	sub new {	1063	sub new {
1015	my $class = shift;	1064	my ($class, %arg) = @_;
		1065
		1066	my $title = delete $arg{title};
1016		1067
1017	my $self = $class->SUPER::new (	1068	my $self = $class->SUPER::new (
1018	bg => [1, 1, 1, 1],	1069	bg => [1, 1, 1, 1],
1019	border_bg => [1, 1, 1, 1],	1070	border_bg => [1, 1, 1, 1],
1020	border => 0.6,	1071	border => 0.6,
1021	is_toplevel => 1,
1022	can_events => 1,	1072	can_events => 1,
1023	@_	1073	min_w => 16,
		1074	min_h => 16,
		1075	%arg,
1024	);	1076	);
1025		1077
1026	$self->{title} &&= new CFClient::UI::Label	1078	$self->{title} = new CFClient::UI::Label
1027	align => 0,	1079	align => 0,
1028	valign => 1,	1080	valign => 1,
1029	text => $self->{title},	1081	text => $title,
1030	fontsize => $self->{border};	1082	fontsize => $self->{border}
		1083	if defined $title;
1031		1084
1032	$self	1085	$self
		1086	}
		1087
		1088	sub add {
		1089	my ($self, @widgets) = @_;
		1090
		1091	$self->SUPER::add (@widgets);
		1092	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1033	}	1093	}
1034		1094
1035	sub border {	1095	sub border {
1036	int $_[0]{border} * $::FONTSIZE	1096	int $_[0]{border} * $::FONTSIZE
1037	}	1097	}
1038		1098
1039	sub size_request {	1099	sub size_request {
1040	my ($self) = @_;	1100	my ($self) = @_;
		1101
		1102	$self->{title}->size_request
		1103	if $self->{title};
1041		1104
1042	my ($w, $h) = $self->SUPER::size_request;	1105	my ($w, $h) = $self->SUPER::size_request;
1043		1106
1044	(	1107	(
1045	$w + $self->border * 2,	1108	$w + $self->border * 2,
1046	$h + $self->border * 2,	1109	$h + $self->border * 2,
1047	)	1110	)
1048	}	1111	}
1049		1112
1050	sub size_allocate {	1113	sub size_allocate {
1051	my ($self, $w, $h, $changed) = @_;	1114	my ($self, $w, $h) = @_;
1052		1115
1053	return unless $changed;	1116	if ($self->{title}) {
		1117	$self->{title}{w} = $w;
		1118	$self->{title}{h} = $h;
		1119	$self->{title}->size_allocate ($w, $h);
		1120	}
1054		1121
		1122	my $border = $self->border;
		1123
1055	$h -= List::Util::max 0, $self->border * 2;	1124	$h -= List::Util::max 0, $border * 2;
1056	$w -= List::Util::max 0, $self->border * 2;	1125	$w -= List::Util::max 0, $border * 2;
1057		1126
1058	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1059	if $self->{title};
1060
1061	$self->child->configure ($self->border, $self->border, $w, $h);	1127	$self->child->configure ($border, $border, $w, $h);
1062	}	1128	}
1063		1129
1064	sub button_down {	1130	sub button_down {
1065	my ($self, $ev, $x, $y) = @_;	1131	my ($self, $ev, $x, $y) = @_;
1066		1132
…		…
1082	my ($ev, $x, $y) = @_;	1148	my ($ev, $x, $y) = @_;
1083		1149
1084	my $dx = $ev->{x} - $ox;	1150	my $dx = $ev->{x} - $ox;
1085	my $dy = $ev->{y} - $oy;	1151	my $dy = $ev->{y} - $oy;
1086		1152
1087	$self->{user_x} = $wx + $dx * $mx;
1088	$self->{user_y} = $wy + $dy * $my;
1089	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1153	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1090	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1154	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1091	$self->move ($self->{user_x}, $self->{user_y});	1155
1092	$self->realloc;	1156	$self->realloc;
		1157	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093	};	1158	};
1094		1159
1095	} elsif ($lr ^ $td) {	1160	} elsif ($lr ^ $td) {
1096	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1161	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1097	my ($bx, $by) = ($self->{x}, $self->{y});	1162	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1099	$self->{motion} = sub {	1164	$self->{motion} = sub {
1100	my ($ev, $x, $y) = @_;	1165	my ($ev, $x, $y) = @_;
1101		1166
1102	($x, $y) = ($ev->{x}, $ev->{y});	1167	($x, $y) = ($ev->{x}, $ev->{y});
1103		1168
1104	$self->{user_x} = $bx + $x - $ox;	1169	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1105	$self->{user_y} = $by + $y - $oy;
1106
1107	$self->move ($self->{user_x}, $self->{user_y});
1108	$self->realloc;
1109	};	1170	};
		1171	} else {
		1172	return 0;
		1173	}
		1174
1110	}	1175	1
1111	}	1176	}
1112		1177
1113	sub button_up {	1178	sub button_up {
1114	my ($self, $ev, $x, $y) = @_;	1179	my ($self, $ev, $x, $y) = @_;
1115		1180
1116	delete $self->{motion};	1181	!!delete $self->{motion}
1117	}	1182	}
1118		1183
1119	sub mouse_motion {	1184	sub mouse_motion {
1120	my ($self, $ev, $x, $y) = @_;	1185	my ($self, $ev, $x, $y) = @_;
1121		1186
1122	$self->{motion}->($ev, $x, $y) if $self->{motion};	1187	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1188
		1189	!!$self->{motion}
1123	}	1190	}
1124		1191
1125	sub _draw {	1192	sub _draw {
1126	my ($self) = @_;	1193	my ($self) = @_;
1127		1194
		1195	my $child = $self->{children}[0];
		1196
1128	my ($w, $h ) = ($self->{w}, $self->{h});	1197	my ($w, $h ) = ($self->{w}, $self->{h});
1129	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1198	my ($cw, $ch) = ($child->{w}, $child->{h});
1130		1199
1131	glEnable GL_TEXTURE_2D;	1200	glEnable GL_TEXTURE_2D;
1132	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1201	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1133		1202
1134	my $border = $self->border;	1203	my $border = $self->border;
1135		1204
1136	glColor @{ $self->{border_bg} };	1205	glColor @{ $self->{border_bg} };
1137	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1206	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1138	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1207	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1139	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1208	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1140	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1209	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1141		1210
1142	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1211	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1143	my $bg = $tex[0];	1212	glColor @{ $self->{bg} };
1144		1213
1145	# TODO: repeat texture not scale	1214	# TODO: repeat texture not scale
		1215	# solve this better(?)
1146	my $rep_x = $cw / $bg->{w};	1216	$bg->{s} = $cw / $bg->{w};
1147	my $rep_y = $ch / $bg->{h};	1217	$bg->{t} = $ch / $bg->{h};
1148
1149	glColor @{ $self->{bg} };
1150
1151	$bg->{s} = $rep_x;
1152	$bg->{t} = $rep_y;
1153	$bg->{wrap_mode} = 1;
1154	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1218	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155	}	1219	}
1156		1220
1157	glDisable GL_TEXTURE_2D;	1221	glDisable GL_TEXTURE_2D;
1158		1222
1159	$self->{title}->draw if $self->{title};
1160
1161	$self->child->draw;	1223	$child->draw;
		1224
		1225	if ($self->{title}) {
		1226	glTranslate 0, $border - $self->{h};
		1227	$self->{title}->_draw;
		1228	}
1162	}	1229	}
1163		1230
1164	#############################################################################	1231	#############################################################################
1165		1232
1166	package CFClient::UI::Table;	1233	package CFClient::UI::Table;
…		…
1240	(sum @$hs),	1307	(sum @$hs),
1241	)	1308	)
1242	}	1309	}
1243		1310
1244	sub size_allocate {	1311	sub size_allocate {
1245	my ($self, $w, $h, $changed) = @_;	1312	my ($self, $w, $h) = @_;
1246		1313
1247	my ($ws, $hs) = $self->get_wh;	1314	my ($ws, $hs) = $self->get_wh;
1248		1315
1249	my $req_w = (sum @$ws) || 1;	1316	my $req_w = (sum @$ws) || 1;
1250	my $req_h = (sum @$hs) || 1;	1317	my $req_h = (sum @$hs) || 1;
…		…
1328	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1395	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1329	)	1396	)
1330	}	1397	}
1331		1398
1332	sub size_allocate {	1399	sub size_allocate {
1333	my ($self, $w, $h, $changed) = @_;	1400	my ($self, $w, $h) = @_;
1334		1401
1335	my $space = $self->{vertical} ? $h : $w;	1402	my $space = $self->{vertical} ? $h : $w;
1336	my $children = $self->{children};	1403	my $children = $self->{children};
1337		1404
1338	my @req;	1405	my @req;
…		…
1421	ellipsise => 3, # end	1488	ellipsise => 3, # end
1422	layout => (new CFClient::Layout),	1489	layout => (new CFClient::Layout),
1423	fontsize => 1,	1490	fontsize => 1,
1424	align => -1,	1491	align => -1,
1425	valign => -1,	1492	valign => -1,
1426	padding => 2,	1493	padding_x => 2,
		1494	padding_y => 2,
1427	can_events => 0,	1495	can_events => 0,
1428	%arg	1496	%arg
1429	);	1497	);
1430		1498
1431	if (exists $self->{template}) {	1499	if (exists $self->{template}) {
…		…
1507		1575
1508	$w = List::Util::max $w, $w2;	1576	$w = List::Util::max $w, $w2;
1509	$h = List::Util::max $h, $h2;	1577	$h = List::Util::max $h, $h2;
1510	}	1578	}
1511		1579
1512	(	1580	($w, $h)
1513	$w + $self->{padding} * 2,
1514	$h + $self->{padding} * 2,
1515	)
1516	}	1581	}
1517		1582
1518	sub size_allocate {	1583	sub size_allocate {
1519	my ($self, $w, $h, $changed) = @_;	1584	my ($self, $w, $h) = @_;
		1585
		1586	delete $self->{ox};
1520		1587
1521	delete $self->{texture}	1588	delete $self->{texture}
1522	if $changed;	1589	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1523	}	1590	}
1524		1591
1525	sub set_fontsize {	1592	sub set_fontsize {
1526	my ($self, $fontsize) = @_;	1593	my ($self, $fontsize) = @_;
1527		1594
…		…
1542	$self->{layout}->set_width ($self->{w});	1609	$self->{layout}->set_width ($self->{w});
1543	$self->{layout}->set_ellipsise ($self->{ellipsise});	1610	$self->{layout}->set_ellipsise ($self->{ellipsise});
1544	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1611	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1612	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546		1613
1547	my $tex = new_from_layout CFClient::Texture $self->{layout};	1614	new_from_layout CFClient::Texture $self->{layout}
		1615	};
1548		1616
		1617	unless (exists $self->{ox}) {
1549	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1618	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1619	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551	: ($self->{w} - $tex->{w}) * 0.5);	1620	: ($self->{w} - $tex->{w}) * 0.5);
1552		1621
1553	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1622	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1623	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555	: ($self->{h} - $tex->{h}) * 0.5);	1624	: ($self->{h} - $tex->{h}) * 0.5);
1556
1557	$tex
1558	};	1625	};
1559		1626
1560	glEnable GL_TEXTURE_2D;	1627	glEnable GL_TEXTURE_2D;
1561	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1628	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562		1629
…		…
1657	$self->{cursor} = length $text;	1724	$self->{cursor} = length $text;
1658	} elsif ($uni == 27) {	1725	} elsif ($uni == 27) {
1659	$self->_emit ('escape');	1726	$self->_emit ('escape');
1660	} elsif ($uni) {	1727	} elsif ($uni) {
1661	substr $text, $self->{cursor}++, 0, chr $uni;	1728	substr $text, $self->{cursor}++, 0, chr $uni;
		1729	} else {
		1730	return 0;
1662	}	1731	}
1663		1732
1664	$self->_set_text ($text);	1733	$self->_set_text ($text);
1665		1734
1666	$self->realloc;	1735	$self->realloc;
		1736
		1737	1
1667	}	1738	}
1668		1739
1669	sub focus_in {	1740	sub focus_in {
1670	my ($self) = @_;	1741	my ($self) = @_;
1671		1742
…		…
1686	utf8::encode $text;	1757	utf8::encode $text;
1687	$self->{cursor} = length substr $text, 0, $idx;	1758	$self->{cursor} = length substr $text, 0, $idx;
1688		1759
1689	$self->_set_text ($self->{text});	1760	$self->_set_text ($self->{text});
1690	$self->update;	1761	$self->update;
		1762
		1763	1
1691	}	1764	}
1692		1765
1693	sub mouse_motion {	1766	sub mouse_motion {
1694	my ($self, $ev, $x, $y) = @_;	1767	my ($self, $ev, $x, $y) = @_;
1695	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1768	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1769
		1770	0
1696	}	1771	}
1697		1772
1698	sub _draw {	1773	sub _draw {
1699	my ($self) = @_;	1774	my ($self) = @_;
1700		1775
…		…
1777	} else {	1852	} else {
1778	$self->set_text ($self->{history_saveback});	1853	$self->set_text ($self->{history_saveback});
1779	}	1854	}
1780		1855
1781	} else {	1856	} else {
1782	$self->SUPER::key_down ($ev);	1857	return $self->SUPER::key_down ($ev)
		1858	}
		1859
1783	}	1860	1
1784
1785	}	1861	}
1786		1862
1787	#############################################################################	1863	#############################################################################
1788		1864
1789	package CFClient::UI::Button;	1865	package CFClient::UI::Button;
…		…
1798		1874
1799	sub new {	1875	sub new {
1800	my $class = shift;	1876	my $class = shift;
1801		1877
1802	$class->SUPER::new (	1878	$class->SUPER::new (
1803	padding => 4,	1879	padding_x => 4,
		1880	padding_y => 4,
1804	fg => [1, 1, 1],	1881	fg => [1, 1, 1],
1805	active_fg => [0, 0, 1],	1882	active_fg => [0, 0, 1],
1806	can_hover => 1,	1883	can_hover => 1,
1807	align => 0,	1884	align => 0,
1808	valign => 0,	1885	valign => 0,
…		…
1817	my ($self, $ev, $x, $y) = @_;	1894	my ($self, $ev, $x, $y) = @_;
1818		1895
1819	$self->emit ("activate")	1896	$self->emit ("activate")
1820	if $x >= 0 && $x < $self->{w}	1897	if $x >= 0 && $x < $self->{w}
1821	&& $y >= 0 && $y < $self->{h};	1898	&& $y >= 0 && $y < $self->{h};
		1899
		1900	1
1822	}	1901	}
1823		1902
1824	sub _draw {	1903	sub _draw {
1825	my ($self) = @_;	1904	my ($self) = @_;
1826		1905
…		…
1855		1934
1856	sub new {	1935	sub new {
1857	my $class = shift;	1936	my $class = shift;
1858		1937
1859	$class->SUPER::new (	1938	$class->SUPER::new (
1860	padding => 2,	1939	padding_x => 2,
		1940	padding_y => 2,
1861	fg => [1, 1, 1],	1941	fg => [1, 1, 1],
1862	active_fg => [1, 1, 0],	1942	active_fg => [1, 1, 0],
1863	bg => [0, 0, 0, 0.2],	1943	bg => [0, 0, 0, 0.2],
1864	active_bg => [1, 1, 1, 0.5],	1944	active_bg => [1, 1, 1, 0.5],
1865	state => 0,	1945	state => 0,
…		…
1869	}	1949	}
1870		1950
1871	sub size_request {	1951	sub size_request {
1872	my ($self) = @_;	1952	my ($self) = @_;
1873		1953
1874	($self->{padding} * 2 + 6) x 2	1954	(6) x 2
1875	}	1955	}
1876		1956
1877	sub button_down {	1957	sub button_down {
1878	my ($self, $ev, $x, $y) = @_;	1958	my ($self, $ev, $x, $y) = @_;
1879		1959
1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1960	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1961	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882	$self->{state} = !$self->{state};	1962	$self->{state} = !$self->{state};
1883	$self->_emit (changed => $self->{state});	1963	$self->_emit (changed => $self->{state});
		1964	} else {
		1965	return 0
		1966	}
		1967
1884	}	1968	1
1885	}	1969	}
1886		1970
1887	sub _draw {	1971	sub _draw {
1888	my ($self) = @_;	1972	my ($self) = @_;
1889		1973
1890	$self->SUPER::_draw;	1974	$self->SUPER::_draw;
1891		1975
1892	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1976	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893		1977
1894	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1978	my ($w, $h) = @$self{qw(w h)};
		1979
		1980	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895		1981
1896	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1982	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897		1983
1898	my $tex = $self->{state} ? $tex[1] : $tex[0];	1984	my $tex = $self->{state} ? $tex[1] : $tex[0];
1899		1985
…		…
2164	fg => [1, 1, 1],	2250	fg => [1, 1, 1],
2165	active_fg => [0, 0, 0],	2251	active_fg => [0, 0, 0],
2166	bg => [0, 0, 0, 0.2],	2252	bg => [0, 0, 0, 0.2],
2167	active_bg => [1, 1, 1, 0.5],	2253	active_bg => [1, 1, 1, 0.5],
2168	range => [0, 0, 100, 10, 0],	2254	range => [0, 0, 100, 10, 0],
2169	req_w => $::WIDTH / 80,	2255	min_w => $::WIDTH / 80,
2170	req_h => $::WIDTH / 80,	2256	min_h => $::WIDTH / 80,
2171	vertical => 0,	2257	vertical => 0,
2172	can_hover => 1,	2258	can_hover => 1,
2173	inner_pad => 0.02,	2259	inner_pad => 0.02,
2174	@_	2260	@_
2175	);	2261	);
…		…
2215	}	2301	}
2216		2302
2217	sub size_request {	2303	sub size_request {
2218	my ($self) = @_;	2304	my ($self) = @_;
2219		2305
2220	my $w = $self->{req_w};	2306	($self->{req_w}, $self->{req_h})
2221	my $h = $self->{req_h};
2222
2223	$self->{vertical} ? ($h, $w) : ($w, $h)
2224	}	2307	}
2225		2308
2226	sub button_down {	2309	sub button_down {
2227	my ($self, $ev, $x, $y) = @_;	2310	my ($self, $ev, $x, $y) = @_;
2228		2311
2229	$self->SUPER::button_down ($ev, $x, $y);	2312	$self->SUPER::button_down ($ev, $x, $y);
2230		2313
2231	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2314	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2232		2315
2233	$self->mouse_motion ($ev, $x, $y);	2316	$self->mouse_motion ($ev, $x, $y)
2234	}	2317	}
2235		2318
2236	sub mouse_motion {	2319	sub mouse_motion {
2237	my ($self, $ev, $x, $y) = @_;	2320	my ($self, $ev, $x, $y) = @_;
2238		2321
…		…
2242	my (undef, $lo, $hi, $page) = @{$self->{range}};	2325	my (undef, $lo, $hi, $page) = @{$self->{range}};
2243		2326
2244	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2327	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2245		2328
2246	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2329	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2330	} else {
		2331	return 0;
		2332	}
		2333
2247	}	2334	1
2248	}	2335	}
2249		2336
2250	sub update {	2337	sub update {
2251	my ($self) = @_;	2338	my ($self) = @_;
2252		2339
…		…
2378	$self->{fontsize} = $fontsize;	2465	$self->{fontsize} = $fontsize;
2379	$self->reflow;	2466	$self->reflow;
2380	}	2467	}
2381		2468
2382	sub size_allocate {	2469	sub size_allocate {
2383	my ($self, $w, $h, $changed) = @_;	2470	my ($self, $w, $h) = @_;
2384		2471
2385	$self->SUPER::size_allocate ($w, $h, $changed);	2472	$self->SUPER::size_allocate ($w, $h);
2386
2387	return unless $changed;
2388		2473
2389	$self->{layout}->set_font ($self->{font}) if $self->{font};	2474	$self->{layout}->set_font ($self->{font}) if $self->{font};
2390	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2475	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391	$self->{layout}->set_width ($self->{children}[0]{w});	2476	$self->{layout}->set_width ($self->{children}[0]{w});
2392		2477
…		…
2615	}	2700	}
2616		2701
2617	sub set_tooltip_from {	2702	sub set_tooltip_from {
2618	my ($self, $widget) = @_;	2703	my ($self, $widget) = @_;
2619		2704
		2705	my $tooltip = $widget->{tooltip};
		2706
		2707	if ($ENV{CFPLUS_DEBUG} & 2) {
		2708	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2709	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2710	. "req $widget->{req_w} $widget->{req_h}\n"
		2711	. "visible $widget->{visible}";
		2712	}
		2713
2620	$self->add (new CFClient::UI::Label	2714	$self->add (new CFClient::UI::Label
2621	markup => $widget->{tooltip},	2715	markup => $tooltip,
2622	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2716	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623	fontsize => 0.8,	2717	fontsize => 0.8,
2624	fg => [0, 0, 0, 1],	2718	fg => [0, 0, 0, 1],
2625	ellipsise => 0,	2719	ellipsise => 0,
2626	font => ($widget->{tooltip_font} || $::FONT_PROP),	2720	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2634		2728
2635	($w + 4, $h + 4)	2729	($w + 4, $h + 4)
2636	}	2730	}
2637		2731
2638	sub size_allocate {	2732	sub size_allocate {
2639	my ($self, $w, $h, $changed) = @_;	2733	my ($self, $w, $h) = @_;
2640		2734
2641	return unless $changed;
2642
2643	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2735	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2736	}
		2737
		2738	sub visibility_change {
		2739	my ($self, $visible) = @_;
		2740
		2741	return unless $visible;
		2742
		2743	$self->{root}->on_post_alloc ("move_$self" => sub {
		2744	my $widget = $self->{owner}
		2745	or return;
		2746
		2747	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2748
		2749	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2750	if $x + $self->{w} > $::WIDTH;
		2751
		2752	$self->move_abs ($x, $y);
		2753	});
2644	}	2754	}
2645		2755
2646	sub _draw {	2756	sub _draw {
2647	my ($self) = @_;	2757	my ($self) = @_;
2648		2758
…		…
2751	$self->SUPER::DESTROY;	2861	$self->SUPER::DESTROY;
2752	}	2862	}
2753		2863
2754	#############################################################################	2864	#############################################################################
2755		2865
2756	package CFClient::UI::Inventory;	2866	package CFClient::UI::Buttonbar;
2757		2867
2758	our @ISA = CFClient::UI::ScrolledWindow::;	2868	our @ISA = CFClient::UI::HBox::;
2759		2869
2760	sub new {	2870	# TODO: should actualyl wrap buttons and other goodies.
2761	my $class = shift;
2762
2763	my $self = $class->SUPER::new (
2764	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2765	@_,
2766	);
2767
2768	$self
2769	}
2770
2771	sub set_items {
2772	my ($self, $items) = @_;
2773
2774	$self->{scrolled}->clear;
2775	return unless $items;
2776
2777	my @items = sort {
2778	($a->{type} <=> $b->{type})
2779	or ($a->{name} cmp $b->{name})
2780	} @$items;
2781
2782	$self->{real_items} = \@items;
2783
2784	my $row = 0;
2785	for my $item (@items) {
2786	CFClient::Item::update_widgets $item;
2787
2788	$self->{scrolled}->add (0, $row, $item->{face_widget});
2789	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2790	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2791
2792	$row++;
2793	}
2794	}
2795		2871
2796	#############################################################################	2872	#############################################################################
2797		2873
2798	package CFClient::UI::Menu;	2874	package CFClient::UI::Menu;
2799		2875
…		…
2840	# maybe save $GRAB? must be careful about events...	2916	# maybe save $GRAB? must be careful about events...
2841	$GRAB = $self;	2917	$GRAB = $self;
2842	$self->{button} = $ev->{button};	2918	$self->{button} = $ev->{button};
2843		2919
2844	$self->show;	2920	$self->show;
2845	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2921	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2846	}	2922	}
2847		2923
2848	sub mouse_motion {	2924	sub mouse_motion {
2849	my ($self, $ev, $x, $y) = @_;	2925	my ($self, $ev, $x, $y) = @_;
2850		2926
2851	# TODO: should use vbox->find_widget or so	2927	# TODO: should use vbox->find_widget or so
2852	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2928	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2853	$self->{hover} = $self->{item}{$HOVER};	2929	$self->{hover} = $self->{item}{$HOVER};
		2930
		2931	0
2854	}	2932	}
2855		2933
2856	sub button_up {	2934	sub button_up {
2857	my ($self, $ev, $x, $y) = @_;	2935	my ($self, $ev, $x, $y) = @_;
2858		2936
…		…
2860	undef $GRAB;	2938	undef $GRAB;
2861	$self->hide;	2939	$self->hide;
2862		2940
2863	$self->_emit ("popdown");	2941	$self->_emit ("popdown");
2864	$self->{hover}[1]->() if $self->{hover};	2942	$self->{hover}[1]->() if $self->{hover};
		2943	} else {
		2944	return 0
		2945	}
		2946
2865	}	2947	1
		2948	}
		2949
		2950	#############################################################################
		2951
		2952	package CFClient::UI::Multiplexer;
		2953
		2954	our @ISA = CFClient::UI::Container::;
		2955
		2956	sub new {
		2957	my $class = shift;
		2958
		2959	my $self = $class->SUPER::new (
		2960	@_,
		2961	);
		2962
		2963	$self->{current} = $self->{children}[0]
		2964	if @{ $self->{children} };
		2965
		2966	$self
		2967	}
		2968
		2969	sub add {
		2970	my ($self, @widgets) = @_;
		2971
		2972	$self->SUPER::add (@widgets);
		2973
		2974	$self->{current} = $self->{children}[0]
		2975	if @{ $self->{children} };
		2976	}
		2977
		2978	sub set_current_page {
		2979	my ($self, $page_or_widget) = @_;
		2980
		2981	my $widget = ref $page_or_widget
		2982	? $page_or_widget
		2983	: $self->{children}[$page_or_widget];
		2984
		2985	$self->{current} = $widget;
		2986	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2987
		2988	$self->_emit (page_changed => $self->{current});
		2989
		2990	$self->realloc;
		2991	}
		2992
		2993	sub visible_children {
		2994	$_[0]{current}
		2995	}
		2996
		2997	sub size_request {
		2998	my ($self) = @_;
		2999
		3000	$self->{current}->size_request
		3001	}
		3002
		3003	sub size_allocate {
		3004	my ($self, $w, $h) = @_;
		3005
		3006	$self->{current}->configure (0, 0, $w, $h);
		3007	}
		3008
		3009	sub _draw {
		3010	my ($self) = @_;
		3011
		3012	$self->{current}->draw;
		3013	}
		3014
		3015	#############################################################################
		3016
		3017	package CFClient::UI::Notebook;
		3018
		3019	our @ISA = CFClient::UI::VBox::;
		3020
		3021	sub new {
		3022	my $class = shift;
		3023
		3024	my $self = $class->SUPER::new (
		3025	buttonbar => (new CFClient::UI::Buttonbar),
		3026	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3027	@_,
		3028	);
		3029
		3030	$self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
		3031
		3032	$self
		3033	}
		3034
		3035	sub add {
		3036	my ($self, $title, $widget, $tooltip) = @_;
		3037
		3038	Scalar::Util::weaken $self;
		3039
		3040	$self->{buttonbar}->add (new CFClient::UI::Button
		3041	markup => $title,
		3042	tooltip => $tooltip,
		3043	on_activate => sub { $self->set_current_page ($widget) },
		3044	);
		3045
		3046	$self->{multiplexer}->add ($widget);
		3047	}
		3048
		3049	sub set_current_page {
		3050	my ($self, $page) = @_;
		3051
		3052	$self->{multiplexer}->set_current_page ($page);
		3053	$self->_emit (page_changed => $self->{multiplexer}{current});
2866	}	3054	}
2867		3055
2868	#############################################################################	3056	#############################################################################
2869		3057
2870	package CFClient::UI::Statusbox;	3058	package CFClient::UI::Statusbox;
…		…
2975	$self->SUPER::reconfigure;	3163	$self->SUPER::reconfigure;
2976	}	3164	}
2977		3165
2978	#############################################################################	3166	#############################################################################
2979		3167
		3168	package CFClient::UI::Inventory;
		3169
		3170	our @ISA = CFClient::UI::ScrolledWindow::;
		3171
		3172	sub new {
		3173	my $class = shift;
		3174
		3175	my $self = $class->SUPER::new (
		3176	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3177	@_,
		3178	);
		3179
		3180	$self
		3181	}
		3182
		3183	sub set_items {
		3184	my ($self, $items) = @_;
		3185
		3186	$self->{scrolled}->clear;
		3187	return unless $items;
		3188
		3189	my @items = sort {
		3190	($a->{type} <=> $b->{type})
		3191	or ($a->{name} cmp $b->{name})
		3192	} @$items;
		3193
		3194	$self->{real_items} = \@items;
		3195
		3196	my $row = 0;
		3197	for my $item (@items) {
		3198	CFClient::Item::update_widgets $item;
		3199
		3200	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3201	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3202	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3203
		3204	$row++;
		3205	}
		3206	}
		3207
		3208	#############################################################################
		3209
		3210	package CFClient::UI::BindEditor;
		3211
		3212	our @ISA = CFClient::UI::FancyFrame::;
		3213
		3214	sub new {
		3215	my $class = shift;
		3216
		3217	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3218
		3219	$self->add (my $vb = new CFClient::UI::VBox);
		3220
		3221
		3222	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3223	text => "start recording",
		3224	tooltip => "Start/Stops recording of actions."
		3225	."All subsequent actions after the recording started will be captured."
		3226	."The actions are displayed after the record was stopped."
		3227	."To bind the action you have to click on the 'Bind' button",
		3228	on_activate => sub {
		3229	unless ($self->{recording}) {
		3230	$self->start;
		3231	} else {
		3232	$self->stop;
		3233	}
		3234	});
		3235
		3236	$vb->add (new CFClient::UI::Label text => "Actions:");
		3237	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3238
		3239	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3240	$vb->add (my $hb = new CFClient::UI::HBox);
		3241	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3242	$hb->add (new CFClient::UI::Button
		3243	text => "bind",
		3244	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3245	on_activate => sub {
		3246	$self->ask_for_bind;
		3247	});
		3248
		3249	$vb->add (my $hb = new CFClient::UI::HBox);
		3250	$hb->add (new CFClient::UI::Button
		3251	text => "ok",
		3252	expand => 1,
		3253	tooltip => "This closes the binding editor and saves the binding",
		3254	on_activate => sub {
		3255	$self->hide;
		3256	$self->commit;
		3257	});
		3258
		3259	$hb->add (new CFClient::UI::Button
		3260	text => "cancel",
		3261	expand => 1,
		3262	tooltip => "This closes the binding editor without saving",
		3263	on_activate => sub {
		3264	$self->hide;
		3265	$self->{binding_cancel}->()
		3266	if $self->{binding_cancel};
		3267	});
		3268
		3269	$self->update_binding_widgets;
		3270
		3271	$self
		3272	}
		3273
		3274	sub commit {
		3275	my ($self) = @_;
		3276	my ($mod, $sym, $cmds) = $self->get_binding;
		3277	if ($sym != 0 && @$cmds > 0) {
		3278	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3279	."'. Don't forget 'Save Config'!");
		3280	$self->{binding_change}->($mod, $sym, $cmds)
		3281	if $self->{binding_change};
		3282	} else {
		3283	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3284	$self->{binding_cancel}->()
		3285	if $self->{binding_cancel};
		3286	}
		3287	}
		3288
		3289	sub start {
		3290	my ($self) = @_;
		3291
		3292	$self->{rec_btn}->set_text ("stop recording");
		3293	$self->{recording} = 1;
		3294	$self->clear_command_list;
		3295	$::CONN->start_record if $::CONN;
		3296	}
		3297
		3298	sub stop {
		3299	my ($self) = @_;
		3300
		3301	$self->{rec_btn}->set_text ("start recording");
		3302	$self->{recording} = 0;
		3303
		3304	my $rec;
		3305	$rec = $::CONN->stop_record if $::CONN;
		3306	return unless ref $rec eq 'ARRAY';
		3307	$self->set_command_list ($rec);
		3308	}
		3309
		3310
		3311	sub ask_for_bind_and_commit {
		3312	my ($self) = @_;
		3313	$self->ask_for_bind (1);
		3314	}
		3315
		3316	sub ask_for_bind {
		3317	my ($self, $commit) = @_;
		3318
		3319	CFClient::Binder::open_binding_dialog (sub {
		3320	my ($mod, $sym) = @_;
		3321	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3322	$self->update_binding_widgets;
		3323	$self->commit if $commit;
		3324	});
		3325	}
		3326
		3327	# $mod and $sym are the modifiers and key symbol
		3328	# $cmds is a array ref of strings (the commands)
		3329	# $cb is the callback that is executed on OK
		3330	# $ccb is the callback that is executed on CANCEL and
		3331	# when the binding was unsuccessful on OK
		3332	sub set_binding {
		3333	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3334
		3335	$self->clear_command_list;
		3336	$self->{recording} = 0;
		3337	$self->{rec_btn}->set_text ("start recording");
		3338
		3339	$self->{binding} = [$mod, $sym];
		3340	$self->{commands} = $cmds;
		3341
		3342	$self->{binding_change} = $cb;
		3343	$self->{binding_cancel} = $ccb;
		3344
		3345	$self->update_binding_widgets;
		3346	}
		3347
		3348	# this is a shortcut method that asks for a binding
		3349	# and then just binds it.
		3350	sub do_quick_binding {
		3351	my ($self, $cmds) = @_;
		3352	$self->set_binding (undef, undef, $cmds, sub {
		3353	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3354	});
		3355	$self->ask_for_bind (1);
		3356	}
		3357
		3358	sub update_binding_widgets {
		3359	my ($self) = @_;
		3360	my ($mod, $sym, $cmds) = $self->get_binding;
		3361	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3362	$self->set_command_list ($cmds);
		3363	}
		3364
		3365	sub get_binding {
		3366	my ($self) = @_;
		3367	return (
		3368	$self->{binding}->[0],
		3369	$self->{binding}->[1],
		3370	[ grep { defined $_ } @{$self->{commands}} ]
		3371	);
		3372	}
		3373
		3374	sub clear_command_list {
		3375	my ($self) = @_;
		3376	$self->{cmdbox}->clear ();
		3377	}
		3378
		3379	sub set_command_list {
		3380	my ($self, $cmds) = @_;
		3381
		3382	$self->{cmdbox}->clear ();
		3383	$self->{commands} = $cmds;
		3384
		3385	my $idx = 0;
		3386
		3387	for (@$cmds) {
		3388	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3389
		3390	my $i = $idx;
		3391	$hb->add (new CFClient::UI::Label text => $_);
		3392	$hb->add (new CFClient::UI::Button
		3393	text => "delete",
		3394	tooltip => "Deletes the action from the record",
		3395	on_activate => sub {
		3396	$self->{cmdbox}->remove ($hb);
		3397	$cmds->[$i] = undef;
		3398	});
		3399
		3400
		3401	$idx++
		3402	}
		3403	}
		3404
		3405	#############################################################################
		3406
		3407	package CFClient::UI::SpellList;
		3408
		3409	our @ISA = CFClient::UI::ScrolledWindow::;
		3410
		3411	sub new {
		3412	my $class = shift;
		3413
		3414	my $self = $class->SUPER::new (
		3415	binding => [],
		3416	commands => [],
		3417	scrolled => (new CFClient::UI::Table),
		3418	@_,
		3419	)
		3420	}
		3421
		3422	# XXX: Do sorting? Argl...
		3423	sub add_spell {
		3424	my ($self, $spell) = @_;
		3425	$self->{spells}->{$spell->{name}} = $spell;
		3426
		3427	$self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3428	face => $spell->{face},
		3429	can_hover => 1,
		3430	can_events => 1,
		3431	tooltip => $spell->{message});
		3432
		3433	$self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3434	text => $spell->{name},
		3435	can_hover => 1,
		3436	can_events => 1,
		3437	tooltip => $spell->{message},
		3438	expand => 1);
		3439
		3440	$self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3441	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3442	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3443	expand => 1);
		3444
		3445	$self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3446	text => "bind to key",
		3447	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3448	}
		3449
		3450	sub rebuild_spell_list {
		3451	my ($self) = @_;
		3452	$self->{tbl_idx} = 0;
		3453	$self->add_spell ($_) for values %{$self->{spells}};
		3454	}
		3455
		3456	sub remove_spell {
		3457	my ($self, $spell) = @_;
		3458	delete $self->{spells}->{$spell->{name}};
		3459	$self->rebuild_spell_list;
		3460	}
		3461
		3462	#############################################################################
		3463
2980	package CFClient::UI::Root;	3464	package CFClient::UI::Root;
2981		3465
2982	our @ISA = CFClient::UI::Container::;	3466	our @ISA = CFClient::UI::Container::;
2983		3467
2984	use CFClient::OpenGL;	3468	use CFClient::OpenGL;
…		…
2994	Scalar::Util::weaken ($self->{root} = $self);	3478	Scalar::Util::weaken ($self->{root} = $self);
2995		3479
2996	$self	3480	$self
2997	}	3481	}
2998		3482
2999	sub configure {
3000	my ($self, $x, $y, $w, $h) = @_;
3001
3002	$self->{w} = $w;
3003	$self->{h} = $h;
3004	}
3005
3006	sub reconfigure {
3007	my ($self) = @_;
3008
3009	$self->SUPER::reconfigure;
3010
3011	$self->size_allocate ($self->{w}, $self->{h}, 1)
3012	if $self->{w};
3013	}
3014
3015	sub size_request {	3483	sub size_request {
3016	my ($self) = @_;	3484	my ($self) = @_;
3017		3485
3018	($self->{w}, $self->{h})	3486	($self->{w}, $self->{h})
3019	}	3487	}
3020		3488
		3489	sub _to_pixel {
		3490	my ($coord, $size, $max) = @_;
		3491
		3492	$coord =
		3493	$coord eq "center" ? ($max - $size) * 0.5
		3494	: $coord eq "max" ? $max
		3495	: $coord;
		3496
		3497	$coord = 0 if $coord < 0;
		3498	$coord = $max - $size if $coord > $max - $size;
		3499
		3500	int $coord + 0.5
		3501	}
		3502
3021	sub size_allocate {	3503	sub size_allocate {
3022	my ($self, $w, $h, $changed) = @_;	3504	my ($self, $w, $h) = @_;
3023		3505
3024	for my $child ($self->children) {	3506	for my $child ($self->children) {
3025	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3507	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3026		3508
3027	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3509	$X = $child->{force_x} if exists $child->{force_x};
3028	if exists $child->{req_x};	3510	$Y = $child->{force_y} if exists $child->{force_y};
3029		3511
3030	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3512	$X = _to_pixel $X, $W, $self->{w};
3031	if exists $child->{req_y};	3513	$Y = _to_pixel $Y, $H, $self->{h};
3032
3033	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
3034
3035	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3036	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3037		3514
3038	$child->configure ($X, $Y, $W, $H);	3515	$child->configure ($X, $Y, $W, $H);
3039	}	3516	}
3040	}	3517	}
3041		3518
…		…
3058	}	3535	}
3059		3536
3060	sub add {	3537	sub add {
3061	my ($self, @children) = @_;	3538	my ($self, @children) = @_;
3062		3539
3063	for my $child (@children) {
3064	$child->{is_toplevel} = 1;	3540	$_->{is_toplevel} = 1
3065		3541	for @children;
3066	# integerise window positions
3067	$child->{x} = int $child->{x};
3068	$child->{y} = int $child->{y};
3069	}
3070		3542
3071	$self->SUPER::add (@children);	3543	$self->SUPER::add (@children);
3072	}	3544	}
3073		3545
3074	sub remove {	3546	sub remove {
3075	my ($self, @children) = @_;	3547	my ($self, @children) = @_;
3076		3548
3077	$self->SUPER::remove (@children);	3549	$self->SUPER::remove (@children);
		3550
		3551	delete $self->{is_toplevel}
		3552	for @children;
3078		3553
3079	while (@children) {	3554	while (@children) {
3080	my $w = pop @children;	3555	my $w = pop @children;
3081	push @children, $w->children;	3556	push @children, $w->children;
3082	$w->set_invisible;	3557	$w->set_invisible;
…		…
3102	$_->()	3577	$_->()
3103	for values %{delete $self->{refresh_hook}};	3578	for values %{delete $self->{refresh_hook}};
3104	}	3579	}
3105		3580
3106	if ($self->{realloc}) {	3581	if ($self->{realloc}) {
		3582	my %queue;
3107	my @queue;	3583	my @queue;
		3584	my $widget;
3108		3585
		3586	outer:
3109	while () {	3587	while () {
3110	if ($self->{realloc}) {	3588	if (my $realloc = delete $self->{realloc}) {
3111	#TODO use array-of-depth approach	3589	for $widget (values %$realloc) {
		3590	$widget->{visible} or next; # do not resize invisible widgets
3112		3591
3113	@queue = sort { $a->{visible} <=> $b->{visible} }	3592	$queue{$widget+0}++ and next; # duplicates are common
3114	@queue, values %{delete $self->{realloc}};	3593
		3594	push @{ $queue[$widget->{visible}] }, $widget;
		3595	}
3115	}	3596	}
3116		3597
		3598	while () {
		3599	@queue or last outer;
		3600
		3601	$widget = pop @{ $queue[-1] || [] }
		3602	and last;
		3603
		3604	pop @queue;
		3605	}
		3606
		3607	delete $queue{$widget+0};
		3608
		3609	my ($w, $h) = $widget->size_request;
		3610
		3611	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3612	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3613
		3614	$w = $widget->{force_w} if exists $widget->{force_w};
		3615	$h = $widget->{force_h} if exists $widget->{force_h};
		3616
		3617	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3618	|| delete $widget->{force_realloc}) {
		3619	$widget->{req_w} = $w;
		3620	$widget->{req_h} = $h;
		3621
		3622	$self->{size_alloc}{$widget+0} = $widget;
		3623
		3624	if (my $parent = $widget->{parent}) {
		3625	$self->{realloc}{$parent+0} = $parent
		3626	unless $queue{$parent+0};
		3627
		3628	$parent->{force_size_alloc} = 1;
		3629	$self->{size_alloc}{$parent+0} = $parent;
		3630	}
		3631	}
		3632
		3633	delete $self->{realloc}{$widget+0};
		3634	}
		3635	}
		3636
		3637	while (my $size_alloc = delete $self->{size_alloc}) {
		3638	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3639	values %$size_alloc;
		3640
		3641	while () {
3117	my $widget = pop @queue || last;	3642	my $widget = pop @queue || last;
3118		3643
3119	$widget->{visible} or last; # do not resize invisible widgets	3644	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3120
3121	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3122	? @$widget{qw(def_w def_h)}
3123	: $widget->size_request;
3124
3125	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3126
3127	$widget->{req_w} = $w;
3128	$widget->{req_h} = $h;
3129
3130	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3131
3132	push @queue, $widget->{parent}
3133	if $widget->{parent};
3134	}
3135	}
3136
3137	while (my $size_alloc = delete $self->{size_alloc}) {
3138	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3139	values %$size_alloc;
3140
3141	while () {
3142	my ($widget, $w, $h) = @{ pop @queue or last };
3143		3645
3144	$w = 0 if $w < 0;	3646	$w = 0 if $w < 0;
3145	$h = 0 if $h < 0;	3647	$h = 0 if $h < 0;
3146		3648
3147	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3649	$w = int $w + 0.5;
		3650	$h = int $h + 0.5;
3148		3651
		3652	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3653	$widget->{old_w} = $widget->{w};
		3654	$widget->{old_h} = $widget->{h};
		3655
3149	$widget->{w} = $w;	3656	$widget->{w} = $w;
3150	$widget->{h} = $h;	3657	$widget->{h} = $h;
3151		3658
3152	$widget->emit (size_allocate => $w, $h, $changed);	3659	$widget->emit (size_allocate => $w, $h);
		3660	}
3153	}	3661	}
3154	}	3662	}
3155		3663
3156	while ($self->{post_alloc_hook}) {	3664	while ($self->{post_alloc_hook}) {
3157	$_->()	3665	$_->()
3158	for values %{delete $self->{post_alloc_hook}};	3666	for values %{delete $self->{post_alloc_hook}};
3159	}	3667	}
		3668
3160		3669
3161	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3670	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3162	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3671	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3163	glClear GL_COLOR_BUFFER_BIT;	3672	glClear GL_COLOR_BUFFER_BIT;
3164		3673
…		…
3166	glLoadIdentity;	3675	glLoadIdentity;
3167	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3676	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3168	glMatrixMode GL_MODELVIEW;	3677	glMatrixMode GL_MODELVIEW;
3169	glLoadIdentity;	3678	glLoadIdentity;
3170		3679
		3680	{
		3681	package CFClient::UI::Base;
		3682
		3683	($draw_x, $draw_y, $draw_w, $draw_h) =
		3684	(0, 0, $self->{w}, $self->{h});
		3685	}
		3686
3171	$self->_draw;	3687	$self->_draw;
3172	}	3688	}
3173		3689
3174	#############################################################################	3690	#############################################################################
3175		3691

Diff Legend

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