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.254 by root, Mon May 29 01:53:23 2006 UTC vs.
Revision 1.273 by root, Sat Jun 3 02:32:35 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) {
45	$TOOLTIP->hide;	51	$TOOLTIP->hide;
46		52
47	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
48		54
…		…
165	sub rescale_widgets {	171	sub rescale_widgets {
166	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
167		173
168	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
169	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
170	$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.]+$/;
171	$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};
172	$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};
173	$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.]+$/;
174	$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};
175	$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
176	}	189	}
177	}	190	}
178		191
179	reconfigure_widgets;	192	reconfigure_widgets;
180	}	193	}
…		…
189		202
190	sub new {	203	sub new {
191	my $class = shift;	204	my $class = shift;
192		205
193	my $self = bless {	206	my $self = bless {
194	x => 0,	207	x => "center",
195	y => 0,	208	y => "center",
196	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
197	can_events => 1,	212	can_events => 1,
198	@_	213	@_
199	}, $class;	214	}, $class;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
200		217
201	for (keys %$self) {	218	for (keys %$self) {
202	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
203	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
204	}	221	}
205	}	222	}
206		223
207	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
208
209	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210	$self->{req_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
211	$self->{req_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
212	$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};
213	$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};
214	}	234	}
215		235
216	$self	236	$self
217	}	237	}
218		238
…		…
227	my ($self) = @_;	247	my ($self) = @_;
228		248
229	return if $self->{parent};	249	return if $self->{parent};
230		250
231	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
232	}
233
234	sub center {
235	my ($self) = @_;
236
237	$CFClient::UI::ROOT->on_post_alloc (
238	"center_$self" => sub {
239	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
240	},
241	);
242
243	$self->update;
244	}	252	}
245		253
246	sub set_visible {	254	sub set_visible {
247	my ($self) = @_;	255	my ($self) = @_;
248		256
…		…
303		311
304	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
305	if $self->{parent};	313	if $self->{parent};
306	}	314	}
307		315
308	sub move {	316	sub move_abs {
309	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
310		318
311	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
312	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
313	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
314		322
315	$self->update;	323	$self->update;
316	}	324	}
317		325
318	sub set_size {	326	sub set_size {
319	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
320		328
321	$self->{def_w} = $w;	329	$self->{force_w} = $w;
322	$self->{def_h} = $h;	330	$self->{force_h} = $h;
323		331
324	$self->realloc;	332	$self->realloc;
325	}	333	}
326		334
327	sub size_request {	335	sub size_request {
…		…
331		339
332	sub configure {	340	sub configure {
333	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
334		342
335	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
336	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
337	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
338		348
339	# use alignment to adjust x, y	349	# use alignment to adjust x, y
340		350
341	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
342	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
343
344	($w, $h) = ($w2, $h2);
345	}	353	}
346		354
347	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
348	$self->{x} = $x;	356	$self->{x} = $x;
349	$self->{y} = $y;	357	$self->{y} = $y;
350	$self->update;	358	$self->update;
351	}	359	}
352		360
353	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
354	return unless $self->{visible};	362	return unless $self->{visible};
355		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
356	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	367	$self->{root}{size_alloc}{$self+0} = $self;
357	}	368	}
358	}	369	}
359		370
360	sub size_allocate {	371	sub size_allocate {
361	# nothing to be done	372	# nothing to be done
362	}	373	}
363		374
364	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
365	}	381	}
366		382
367	sub set_max_size {	383	sub set_max_size {
368	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
369		385
…		…
428		444
429	$::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
430	unless $FOCUS;	446	unless $FOCUS;
431	}	447	}
432		448
433	sub mouse_motion { }	449	sub mouse_motion { 0 }
434	sub button_up { }	450	sub button_up { 0 }
435	sub key_down { }	451	sub key_down { 0 }
436	sub key_up { }	452	sub key_up { 0 }
437		453
438	sub button_down {	454	sub button_down {
439	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
440		456
441	$self->focus_in;	457	$self->focus_in;
442	}
443		458
444	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
445	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
446	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
447	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
448	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
449		461
450	sub find_widget {	462	sub find_widget {
451	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
452		464
453	return () unless $self->{can_events};	465	return () unless $self->{can_events};
…		…
461		473
462	sub set_parent {	474	sub set_parent {
463	my ($self, $parent) = @_;	475	my ($self, $parent) = @_;
464		476
465	Scalar::Util::weaken ($self->{parent} = $parent);	477	Scalar::Util::weaken ($self->{parent} = $parent);
466
467	$self->set_visible if $parent->{visible};	478	$self->set_visible if $parent->{visible};
468	}	479	}
469		480
470	sub connect {	481	sub connect {
471	my ($self, $signal, $cb) = @_;	482	my ($self, $signal, $cb) = @_;
…		…
492		503
493	sub realloc {	504	sub realloc {
494	my ($self) = @_;	505	my ($self) = @_;
495		506
496	if ($self->{visible}) {	507	if ($self->{visible}) {
497	return if $self->{root}{realloc}{$self};	508	return if $self->{root}{realloc}{$self+0};
498		509
499	$self->{root}{realloc}{$self} = $self;	510	$self->{root}{realloc}{$self+0} = $self;
500	$self->{root}->update;	511	$self->{root}->update;
501	} else {	512	} else {
502	delete $self->{req_w};	513	delete $self->{req_w};
		514	delete $self->{req_h};
503	}	515	}
504	}	516	}
505		517
506	sub update {	518	sub update {
507	my ($self) = @_;	519	my ($self) = @_;
508		520
509	$self->{parent}->update	521	$self->{parent}->update
510	if $self->{parent};	522	if $self->{parent};
511	}	523	}
512		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
513	sub draw {	536	sub draw {
514	my ($self) = @_;	537	my ($self) = @_;
515		538
516	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);
517		550
518	glPushMatrix;	551	glPushMatrix;
519	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
520	$self->_draw;	553	$self->_draw;
521	glPopMatrix;	554	glPopMatrix;
…		…
533	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
534	glEnd;	567	glEnd;
535	glDisable GL_BLEND;	568	glDisable GL_BLEND;
536	}	569	}
537		570
538	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
539	glPushMatrix;	572	glPushMatrix;
540	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
541	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
542	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
543	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
619	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
620	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
621	}	654	}
622		655
623	sub size_request {	656	sub size_request {
624	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
625	}	660	}
626		661
627	sub draw { }	662	sub draw { }
628		663
629	#############################################################################	664	#############################################################################
…		…
633	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
634		669
635	sub new {	670	sub new {
636	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
637		672
638	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
639		674
640	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
641	children => [],	676	children => [],
642	can_events => 0,	677	can_events => 0,
643	%arg,	678	%arg,
644	);	679	);
		680
645	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
646		683
647	$self	684	$self
648	}	685	}
649		686
650	sub add {	687	sub add {
…		…
698	$x -= $self->{x};	735	$x -= $self->{x};
699	$y -= $self->{y};	736	$y -= $self->{y};
700		737
701	my $res;	738	my $res;
702		739
703	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
704	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
705	and return $res;	742	and return $res;
706	}	743	}
707		744
708	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
750	sub size_request {	787	sub size_request {
751	$_[0]{children}[0]->size_request	788	$_[0]{children}[0]->size_request
752	}	789	}
753		790
754	sub size_allocate {	791	sub size_allocate {
755	my ($self, $w, $h, $changed) = @_;	792	my ($self, $w, $h) = @_;
756		793
757	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
758	}	795	}
759		796
760	#############################################################################	797	#############################################################################
…		…
777	$ROOT->on_post_alloc ($self => sub { $self->render_child });	814	$ROOT->on_post_alloc ($self => sub { $self->render_child });
778	$self->SUPER::update;	815	$self->SUPER::update;
779	}	816	}
780		817
781	sub size_allocate {	818	sub size_allocate {
782	my ($self, $w, $h, $changed) = @_;	819	my ($self, $w, $h) = @_;
783		820
784	$self->SUPER::size_allocate ($w, $h, $changed);	821	$self->SUPER::size_allocate ($w, $h);
785	$self->update	822	$self->update;
786	if $changed;
787	}	823	}
788		824
789	sub _render {	825	sub _render {
		826	my ($self) = @_;
		827
790	$_[0]{children}[0]->draw;	828	$self->{children}[0]->draw;
791	}	829	}
792		830
793	sub render_child {	831	sub render_child {
794	my ($self) = @_;	832	my ($self) = @_;
795		833
796	$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 {
797	glClearColor 0, 0, 0, 0;	835	glClearColor 0, 0, 0, 0;
798	glClear GL_COLOR_BUFFER_BIT;	836	glClear GL_COLOR_BUFFER_BIT;
799		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
800	$self->_render;	845	$self->_render;
801	};	846	};
802	}	847	}
803		848
804	sub _draw {	849	sub _draw {
805	my ($self) = @_;	850	my ($self) = @_;
806		851
807	my ($w, $h) = ($self->w, $self->h);	852	my ($w, $h) = @$self{qw(w h)};
808		853
809	my $tex = $self->{texture}	854	my $tex = $self->{texture}
810	or return;	855	or return;
811		856
812	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
…		…
835	}	880	}
836		881
837	sub size_request {	882	sub size_request {
838	my ($self) = @_;	883	my ($self) = @_;
839		884
840	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)};
841		886
842	$w = 10 if $self->{scroll_x};	887	$w = 10 if $self->{scroll_x};
843	$h = 10 if $self->{scroll_y};	888	$h = 10 if $self->{scroll_y};
844		889
845	($w, $h)	890	($w, $h)
846	}	891	}
847		892
848	sub size_allocate {	893	sub size_allocate {
849	my ($self, $w, $h, $changed) = @_;	894	my ($self, $w, $h) = @_;
850		895
		896	my $child = $self->child;
		897
851	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853		900
854	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
855	$self->update;	902	$self->update;
856	}	903	}
857		904
…		…
893	}	940	}
894		941
895	sub _render {	942	sub _render {
896	my ($self) = @_;	943	my ($self) = @_;
897		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};
		947
898	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	948	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899		949
900	$self->SUPER::_render;	950	$self->SUPER::_render;
901	}	951	}
902		952
…		…
905	package CFClient::UI::ScrolledWindow;	955	package CFClient::UI::ScrolledWindow;
906		956
907	our @ISA = CFClient::UI::HBox::;	957	our @ISA = CFClient::UI::HBox::;
908		958
909	sub new {	959	sub new {
910	my $class = shift;	960	my ($class, %arg) = @_;
		961
		962	my $child = delete $arg{child};
911		963
912	my $self;	964	my $self;
913		965
914	my $slider = new CFClient::UI::Slider	966	my $slider = new CFClient::UI::Slider
915	vertical => 1,	967	vertical => 1,
…		…
920	;	972	;
921		973
922	$self = $class->SUPER::new (	974	$self = $class->SUPER::new (
923	vp => (new CFClient::UI::ViewPort expand => 1),	975	vp => (new CFClient::UI::ViewPort expand => 1),
924	slider => $slider,	976	slider => $slider,
925	@_,	977	%arg,
926	);	978	);
927		979
928	$self->{vp}->add ($self->{scrolled});
929	$self->add ($self->{vp});
930	$self->add ($self->{slider});	980	$self->SUPER::add ($self->{vp}, $self->{slider});
		981	$self->add ($child) if $child;
931		982
932	$self	983	$self
		984	}
		985
		986	sub add {
		987	my ($self, $widget) = @_;
		988
		989	$self->{vp}->add ($self->{child} = $widget);
933	}	990	}
934		991
935	sub update {	992	sub update {
936	my ($self) = @_;	993	my ($self) = @_;
937		994
…		…
941	my $child = $self->{vp}->child;	998	my $child = $self->{vp}->child;
942	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	999	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943	}	1000	}
944		1001
945	sub size_allocate {	1002	sub size_allocate {
946	my ($self, $w, $h, $changed) = @_;	1003	my ($self, $w, $h) = @_;
947		1004
948	$self->SUPER::size_allocate ($w, $h, $changed);	1005	$self->SUPER::size_allocate ($w, $h);
949		1006
950	my $child = $self->{vp}->child;	1007	my $child = $self->{vp}->child;
951	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1008	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
952	}	1009	}
953		1010
…		…
1000		1057
1001	our @ISA = CFClient::UI::Bin::;	1058	our @ISA = CFClient::UI::Bin::;
1002		1059
1003	use CFClient::OpenGL;	1060	use CFClient::OpenGL;
1004		1061
1005	my @tex =	1062	my $bg =
		1063	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1064	mipmap => 1, wrap => 1;
		1065
		1066	my @border =
1006	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1067	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1007	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1068	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1008		1069
1009	sub new {	1070	sub new {
1010	my $class = shift;	1071	my ($class, %arg) = @_;
		1072
		1073	my $title = delete $arg{title};
1011		1074
1012	my $self = $class->SUPER::new (	1075	my $self = $class->SUPER::new (
1013	bg => [1, 1, 1, 1],	1076	bg => [1, 1, 1, 1],
1014	border_bg => [1, 1, 1, 1],	1077	border_bg => [1, 1, 1, 1],
1015	border => 0.6,	1078	border => 0.6,
1016	is_toplevel => 1,
1017	can_events => 1,	1079	can_events => 1,
1018	@_	1080	min_w => 16,
		1081	min_h => 16,
		1082	%arg,
1019	);	1083	);
1020		1084
1021	$self->{title} &&= new CFClient::UI::Label	1085	$self->{title} = new CFClient::UI::Label
1022	align => 0,	1086	align => 0,
1023	valign => 1,	1087	valign => 1,
1024	text => $self->{title},	1088	text => $title,
1025	fontsize => $self->{border};	1089	fontsize => $self->{border}
		1090	if defined $title;
1026		1091
1027	$self	1092	$self
		1093	}
		1094
		1095	sub add {
		1096	my ($self, @widgets) = @_;
		1097
		1098	$self->SUPER::add (@widgets);
		1099	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1028	}	1100	}
1029		1101
1030	sub border {	1102	sub border {
1031	int $_[0]{border} * $::FONTSIZE	1103	int $_[0]{border} * $::FONTSIZE
1032	}	1104	}
1033		1105
1034	sub size_request {	1106	sub size_request {
1035	my ($self) = @_;	1107	my ($self) = @_;
		1108
		1109	$self->{title}->size_request
		1110	if $self->{title};
1036		1111
1037	my ($w, $h) = $self->SUPER::size_request;	1112	my ($w, $h) = $self->SUPER::size_request;
1038		1113
1039	(	1114	(
1040	$w + $self->border * 2,	1115	$w + $self->border * 2,
1041	$h + $self->border * 2,	1116	$h + $self->border * 2,
1042	)	1117	)
1043	}	1118	}
1044		1119
1045	sub size_allocate {	1120	sub size_allocate {
1046	my ($self, $w, $h, $changed) = @_;	1121	my ($self, $w, $h) = @_;
1047		1122
1048	return unless $changed;	1123	if ($self->{title}) {
		1124	$self->{title}{w} = $w;
		1125	$self->{title}{h} = $h;
		1126	$self->{title}->size_allocate ($w, $h);
		1127	}
1049		1128
		1129	my $border = $self->border;
		1130
1050	$h -= List::Util::max 0, $self->border * 2;	1131	$h -= List::Util::max 0, $border * 2;
1051	$w -= List::Util::max 0, $self->border * 2;	1132	$w -= List::Util::max 0, $border * 2;
1052		1133
1053	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1054	if $self->{title};
1055
1056	$self->child->configure ($self->border, $self->border, $w, $h);	1134	$self->child->configure ($border, $border, $w, $h);
1057	}	1135	}
1058		1136
1059	sub button_down {	1137	sub button_down {
1060	my ($self, $ev, $x, $y) = @_;	1138	my ($self, $ev, $x, $y) = @_;
1061		1139
…		…
1077	my ($ev, $x, $y) = @_;	1155	my ($ev, $x, $y) = @_;
1078		1156
1079	my $dx = $ev->{x} - $ox;	1157	my $dx = $ev->{x} - $ox;
1080	my $dy = $ev->{y} - $oy;	1158	my $dy = $ev->{y} - $oy;
1081		1159
1082	$self->{user_x} = $wx + $dx * $mx;
1083	$self->{user_y} = $wy + $dy * $my;
1084	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1160	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1161	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086	$self->move ($self->{user_x}, $self->{user_y});	1162
1087	$self->realloc;	1163	$self->realloc;
		1164	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1088	};	1165	};
1089		1166
1090	} elsif ($lr ^ $td) {	1167	} elsif ($lr ^ $td) {
1091	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1168	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1092	my ($bx, $by) = ($self->{x}, $self->{y});	1169	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1094	$self->{motion} = sub {	1171	$self->{motion} = sub {
1095	my ($ev, $x, $y) = @_;	1172	my ($ev, $x, $y) = @_;
1096		1173
1097	($x, $y) = ($ev->{x}, $ev->{y});	1174	($x, $y) = ($ev->{x}, $ev->{y});
1098		1175
1099	$self->{user_x} = $bx + $x - $ox;	1176	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1100	$self->{user_y} = $by + $y - $oy;
1101
1102	$self->move ($self->{user_x}, $self->{user_y});
1103	$self->realloc;
1104	};	1177	};
		1178	} else {
		1179	return 0;
		1180	}
		1181
1105	}	1182	1
1106	}	1183	}
1107		1184
1108	sub button_up {	1185	sub button_up {
1109	my ($self, $ev, $x, $y) = @_;	1186	my ($self, $ev, $x, $y) = @_;
1110		1187
1111	delete $self->{motion};	1188	!!delete $self->{motion}
1112	}	1189	}
1113		1190
1114	sub mouse_motion {	1191	sub mouse_motion {
1115	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1116		1193
1117	$self->{motion}->($ev, $x, $y) if $self->{motion};	1194	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1195
		1196	!!$self->{motion}
1118	}	1197	}
1119		1198
1120	sub _draw {	1199	sub _draw {
1121	my ($self) = @_;	1200	my ($self) = @_;
1122		1201
		1202	my $child = $self->{children}[0];
		1203
1123	my ($w, $h ) = ($self->{w}, $self->{h});	1204	my ($w, $h ) = ($self->{w}, $self->{h});
1124	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1205	my ($cw, $ch) = ($child->{w}, $child->{h});
1125		1206
1126	glEnable GL_TEXTURE_2D;	1207	glEnable GL_TEXTURE_2D;
1127	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1208	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128		1209
1129	my $border = $self->border;	1210	my $border = $self->border;
1130		1211
1131	glColor @{ $self->{border_bg} };	1212	glColor @{ $self->{border_bg} };
1132	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1213	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1133	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1214	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1215	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1216	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136		1217
1137	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1218	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138	my $bg = $tex[0];	1219	glColor @{ $self->{bg} };
1139		1220
1140	# TODO: repeat texture not scale	1221	# TODO: repeat texture not scale
		1222	# solve this better(?)
1141	my $rep_x = $cw / $bg->{w};	1223	$bg->{s} = $cw / $bg->{w};
1142	my $rep_y = $ch / $bg->{h};	1224	$bg->{t} = $ch / $bg->{h};
1143
1144	glColor @{ $self->{bg} };
1145
1146	$bg->{s} = $rep_x;
1147	$bg->{t} = $rep_y;
1148	$bg->{wrap_mode} = 1;
1149	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1225	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150	}	1226	}
1151		1227
1152	glDisable GL_TEXTURE_2D;	1228	glDisable GL_TEXTURE_2D;
1153		1229
1154	$self->{title}->draw if $self->{title};
1155
1156	$self->child->draw;	1230	$child->draw;
		1231
		1232	if ($self->{title}) {
		1233	glTranslate 0, $border - $self->{h};
		1234	$self->{title}->_draw;
		1235	}
1157	}	1236	}
1158		1237
1159	#############################################################################	1238	#############################################################################
1160		1239
1161	package CFClient::UI::Table;	1240	package CFClient::UI::Table;
…		…
1235	(sum @$hs),	1314	(sum @$hs),
1236	)	1315	)
1237	}	1316	}
1238		1317
1239	sub size_allocate {	1318	sub size_allocate {
1240	my ($self, $w, $h, $changed) = @_;	1319	my ($self, $w, $h) = @_;
1241		1320
1242	my ($ws, $hs) = $self->get_wh;	1321	my ($ws, $hs) = $self->get_wh;
1243		1322
1244	my $req_w = (sum @$ws) || 1;	1323	my $req_w = (sum @$ws) || 1;
1245	my $req_h = (sum @$hs) || 1;	1324	my $req_h = (sum @$hs) || 1;
…		…
1323	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1402	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1324	)	1403	)
1325	}	1404	}
1326		1405
1327	sub size_allocate {	1406	sub size_allocate {
1328	my ($self, $w, $h, $changed) = @_;	1407	my ($self, $w, $h) = @_;
1329		1408
1330	my $space = $self->{vertical} ? $h : $w;	1409	my $space = $self->{vertical} ? $h : $w;
1331	my $children = $self->{children};	1410	my $children = $self->{children};
1332		1411
1333	my @req;	1412	my @req;
…		…
1416	ellipsise => 3, # end	1495	ellipsise => 3, # end
1417	layout => (new CFClient::Layout),	1496	layout => (new CFClient::Layout),
1418	fontsize => 1,	1497	fontsize => 1,
1419	align => -1,	1498	align => -1,
1420	valign => -1,	1499	valign => -1,
1421	padding => 2,	1500	padding_x => 2,
		1501	padding_y => 2,
1422	can_events => 0,	1502	can_events => 0,
1423	%arg	1503	%arg
1424	);	1504	);
1425		1505
1426	if (exists $self->{template}) {	1506	if (exists $self->{template}) {
…		…
1502		1582
1503	$w = List::Util::max $w, $w2;	1583	$w = List::Util::max $w, $w2;
1504	$h = List::Util::max $h, $h2;	1584	$h = List::Util::max $h, $h2;
1505	}	1585	}
1506		1586
1507	(	1587	($w, $h)
1508	$w + $self->{padding} * 2,
1509	$h + $self->{padding} * 2,
1510	)
1511	}	1588	}
1512		1589
1513	sub size_allocate {	1590	sub size_allocate {
1514	my ($self, $w, $h, $changed) = @_;	1591	my ($self, $w, $h) = @_;
		1592
		1593	delete $self->{ox};
1515		1594
1516	delete $self->{texture}	1595	delete $self->{texture}
1517	if $changed;	1596	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1518	}	1597	}
1519		1598
1520	sub set_fontsize {	1599	sub set_fontsize {
1521	my ($self, $fontsize) = @_;	1600	my ($self, $fontsize) = @_;
1522		1601
…		…
1537	$self->{layout}->set_width ($self->{w});	1616	$self->{layout}->set_width ($self->{w});
1538	$self->{layout}->set_ellipsise ($self->{ellipsise});	1617	$self->{layout}->set_ellipsise ($self->{ellipsise});
1539	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1618	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1619	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541		1620
1542	my $tex = new_from_layout CFClient::Texture $self->{layout};	1621	new_from_layout CFClient::Texture $self->{layout}
		1622	};
1543		1623
		1624	unless (exists $self->{ox}) {
1544	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1625	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1545	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1626	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1546	: ($self->{w} - $tex->{w}) * 0.5);	1627	: ($self->{w} - $tex->{w}) * 0.5);
1547		1628
1548	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1629	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1549	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1630	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1550	: ($self->{h} - $tex->{h}) * 0.5);	1631	: ($self->{h} - $tex->{h}) * 0.5);
1551
1552	$tex
1553	};	1632	};
1554		1633
1555	glEnable GL_TEXTURE_2D;	1634	glEnable GL_TEXTURE_2D;
1556	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1557		1636
…		…
1652	$self->{cursor} = length $text;	1731	$self->{cursor} = length $text;
1653	} elsif ($uni == 27) {	1732	} elsif ($uni == 27) {
1654	$self->_emit ('escape');	1733	$self->_emit ('escape');
1655	} elsif ($uni) {	1734	} elsif ($uni) {
1656	substr $text, $self->{cursor}++, 0, chr $uni;	1735	substr $text, $self->{cursor}++, 0, chr $uni;
		1736	} else {
		1737	return 0;
1657	}	1738	}
1658		1739
1659	$self->_set_text ($text);	1740	$self->_set_text ($text);
1660		1741
1661	$self->realloc;	1742	$self->realloc;
		1743
		1744	1
1662	}	1745	}
1663		1746
1664	sub focus_in {	1747	sub focus_in {
1665	my ($self) = @_;	1748	my ($self) = @_;
1666		1749
…		…
1681	utf8::encode $text;	1764	utf8::encode $text;
1682	$self->{cursor} = length substr $text, 0, $idx;	1765	$self->{cursor} = length substr $text, 0, $idx;
1683		1766
1684	$self->_set_text ($self->{text});	1767	$self->_set_text ($self->{text});
1685	$self->update;	1768	$self->update;
		1769
		1770	1
1686	}	1771	}
1687		1772
1688	sub mouse_motion {	1773	sub mouse_motion {
1689	my ($self, $ev, $x, $y) = @_;	1774	my ($self, $ev, $x, $y) = @_;
1690	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1775	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1776
		1777	0
1691	}	1778	}
1692		1779
1693	sub _draw {	1780	sub _draw {
1694	my ($self) = @_;	1781	my ($self) = @_;
1695		1782
…		…
1772	} else {	1859	} else {
1773	$self->set_text ($self->{history_saveback});	1860	$self->set_text ($self->{history_saveback});
1774	}	1861	}
1775		1862
1776	} else {	1863	} else {
1777	$self->SUPER::key_down ($ev);	1864	return $self->SUPER::key_down ($ev)
		1865	}
		1866
1778	}	1867	1
1779
1780	}	1868	}
1781		1869
1782	#############################################################################	1870	#############################################################################
1783		1871
1784	package CFClient::UI::Button;	1872	package CFClient::UI::Button;
…		…
1793		1881
1794	sub new {	1882	sub new {
1795	my $class = shift;	1883	my $class = shift;
1796		1884
1797	$class->SUPER::new (	1885	$class->SUPER::new (
1798	padding => 4,	1886	padding_x => 4,
		1887	padding_y => 4,
1799	fg => [1, 1, 1],	1888	fg => [1, 1, 1],
1800	active_fg => [0, 0, 1],	1889	active_fg => [0, 0, 1],
1801	can_hover => 1,	1890	can_hover => 1,
1802	align => 0,	1891	align => 0,
1803	valign => 0,	1892	valign => 0,
…		…
1812	my ($self, $ev, $x, $y) = @_;	1901	my ($self, $ev, $x, $y) = @_;
1813		1902
1814	$self->emit ("activate")	1903	$self->emit ("activate")
1815	if $x >= 0 && $x < $self->{w}	1904	if $x >= 0 && $x < $self->{w}
1816	&& $y >= 0 && $y < $self->{h};	1905	&& $y >= 0 && $y < $self->{h};
		1906
		1907	1
1817	}	1908	}
1818		1909
1819	sub _draw {	1910	sub _draw {
1820	my ($self) = @_;	1911	my ($self) = @_;
1821		1912
…		…
1850		1941
1851	sub new {	1942	sub new {
1852	my $class = shift;	1943	my $class = shift;
1853		1944
1854	$class->SUPER::new (	1945	$class->SUPER::new (
1855	padding => 2,	1946	padding_x => 2,
		1947	padding_y => 2,
1856	fg => [1, 1, 1],	1948	fg => [1, 1, 1],
1857	active_fg => [1, 1, 0],	1949	active_fg => [1, 1, 0],
1858	bg => [0, 0, 0, 0.2],	1950	bg => [0, 0, 0, 0.2],
1859	active_bg => [1, 1, 1, 0.5],	1951	active_bg => [1, 1, 1, 0.5],
1860	state => 0,	1952	state => 0,
…		…
1864	}	1956	}
1865		1957
1866	sub size_request {	1958	sub size_request {
1867	my ($self) = @_;	1959	my ($self) = @_;
1868		1960
1869	($self->{padding} * 2 + 6) x 2	1961	(6) x 2
1870	}	1962	}
1871		1963
1872	sub button_down {	1964	sub button_down {
1873	my ($self, $ev, $x, $y) = @_;	1965	my ($self, $ev, $x, $y) = @_;
1874		1966
1875	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1967	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1968	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877	$self->{state} = !$self->{state};	1969	$self->{state} = !$self->{state};
1878	$self->_emit (changed => $self->{state});	1970	$self->_emit (changed => $self->{state});
		1971	} else {
		1972	return 0
		1973	}
		1974
1879	}	1975	1
1880	}	1976	}
1881		1977
1882	sub _draw {	1978	sub _draw {
1883	my ($self) = @_;	1979	my ($self) = @_;
1884		1980
1885	$self->SUPER::_draw;	1981	$self->SUPER::_draw;
1886		1982
1887	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1983	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888		1984
1889	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1985	my ($w, $h) = @$self{qw(w h)};
		1986
		1987	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1890		1988
1891	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1989	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892		1990
1893	my $tex = $self->{state} ? $tex[1] : $tex[0];	1991	my $tex = $self->{state} ? $tex[1] : $tex[0];
1894		1992
…		…
2159	fg => [1, 1, 1],	2257	fg => [1, 1, 1],
2160	active_fg => [0, 0, 0],	2258	active_fg => [0, 0, 0],
2161	bg => [0, 0, 0, 0.2],	2259	bg => [0, 0, 0, 0.2],
2162	active_bg => [1, 1, 1, 0.5],	2260	active_bg => [1, 1, 1, 0.5],
2163	range => [0, 0, 100, 10, 0],	2261	range => [0, 0, 100, 10, 0],
2164	req_w => $::WIDTH / 80,	2262	min_w => $::WIDTH / 80,
2165	req_h => $::WIDTH / 80,	2263	min_h => $::WIDTH / 80,
2166	vertical => 0,	2264	vertical => 0,
2167	can_hover => 1,	2265	can_hover => 1,
2168	inner_pad => 0.02,	2266	inner_pad => 0.02,
2169	@_	2267	@_
2170	);	2268	);
…		…
2210	}	2308	}
2211		2309
2212	sub size_request {	2310	sub size_request {
2213	my ($self) = @_;	2311	my ($self) = @_;
2214		2312
2215	my $w = $self->{req_w};	2313	($self->{req_w}, $self->{req_h})
2216	my $h = $self->{req_h};
2217
2218	$self->{vertical} ? ($h, $w) : ($w, $h)
2219	}	2314	}
2220		2315
2221	sub button_down {	2316	sub button_down {
2222	my ($self, $ev, $x, $y) = @_;	2317	my ($self, $ev, $x, $y) = @_;
2223		2318
2224	$self->SUPER::button_down ($ev, $x, $y);	2319	$self->SUPER::button_down ($ev, $x, $y);
2225		2320
2226	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2321	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227		2322
2228	$self->mouse_motion ($ev, $x, $y);	2323	$self->mouse_motion ($ev, $x, $y)
2229	}	2324	}
2230		2325
2231	sub mouse_motion {	2326	sub mouse_motion {
2232	my ($self, $ev, $x, $y) = @_;	2327	my ($self, $ev, $x, $y) = @_;
2233		2328
…		…
2237	my (undef, $lo, $hi, $page) = @{$self->{range}};	2332	my (undef, $lo, $hi, $page) = @{$self->{range}};
2238		2333
2239	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2334	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240		2335
2241	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2336	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2337	} else {
		2338	return 0;
		2339	}
		2340
2242	}	2341	1
2243	}	2342	}
2244		2343
2245	sub update {	2344	sub update {
2246	my ($self) = @_;	2345	my ($self) = @_;
2247		2346
…		…
2373	$self->{fontsize} = $fontsize;	2472	$self->{fontsize} = $fontsize;
2374	$self->reflow;	2473	$self->reflow;
2375	}	2474	}
2376		2475
2377	sub size_allocate {	2476	sub size_allocate {
2378	my ($self, $w, $h, $changed) = @_;	2477	my ($self, $w, $h) = @_;
2379		2478
2380	$self->SUPER::size_allocate ($w, $h, $changed);	2479	$self->SUPER::size_allocate ($w, $h);
2381
2382	return unless $changed;
2383		2480
2384	$self->{layout}->set_font ($self->{font}) if $self->{font};	2481	$self->{layout}->set_font ($self->{font}) if $self->{font};
2385	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2482	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386	$self->{layout}->set_width ($self->{children}[0]{w});	2483	$self->{layout}->set_width ($self->{children}[0]{w});
2387		2484
…		…
2610	}	2707	}
2611		2708
2612	sub set_tooltip_from {	2709	sub set_tooltip_from {
2613	my ($self, $widget) = @_;	2710	my ($self, $widget) = @_;
2614		2711
		2712	my $tooltip = $widget->{tooltip};
		2713
		2714	if ($ENV{CFPLUS_DEBUG} & 2) {
		2715	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2716	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2717	. "req $widget->{req_w} $widget->{req_h}\n"
		2718	. "visible $widget->{visible}";
		2719	}
		2720
2615	$self->add (new CFClient::UI::Label	2721	$self->add (new CFClient::UI::Label
2616	markup => $widget->{tooltip},	2722	markup => $tooltip,
2617	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2723	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618	fontsize => 0.8,	2724	fontsize => 0.8,
2619	fg => [0, 0, 0, 1],	2725	fg => [0, 0, 0, 1],
2620	ellipsise => 0,	2726	ellipsise => 0,
2621	font => ($widget->{tooltip_font} || $::FONT_PROP),	2727	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2629		2735
2630	($w + 4, $h + 4)	2736	($w + 4, $h + 4)
2631	}	2737	}
2632		2738
2633	sub size_allocate {	2739	sub size_allocate {
2634	my ($self, $w, $h, $changed) = @_;	2740	my ($self, $w, $h) = @_;
2635		2741
2636	return unless $changed;
2637
2638	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2742	$self->SUPER::size_allocate ($w - 4, $h - 4);
2639	}	2743	}
2640		2744
2641	sub visibility_change {	2745	sub visibility_change {
2642	my ($self, $visible) = @_;	2746	my ($self, $visible) = @_;
2643		2747
…		…
2650	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2754	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2651		2755
2652	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2756	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2653	if $x + $self->{w} > $::WIDTH;	2757	if $x + $self->{w} > $::WIDTH;
2654		2758
2655	$self->move ($x, $y);	2759	$self->move_abs ($x, $y);
2656	});	2760	});
2657	}	2761	}
2658		2762
2659	sub _draw {	2763	sub _draw {
2660	my ($self) = @_;	2764	my ($self) = @_;
…		…
2764	$self->SUPER::DESTROY;	2868	$self->SUPER::DESTROY;
2765	}	2869	}
2766		2870
2767	#############################################################################	2871	#############################################################################
2768		2872
2769	package CFClient::UI::Inventory;	2873	package CFClient::UI::Buttonbar;
2770		2874
2771	our @ISA = CFClient::UI::ScrolledWindow::;	2875	our @ISA = CFClient::UI::HBox::;
2772		2876
2773	sub new {	2877	# TODO: should actualyl wrap buttons and other goodies.
2774	my $class = shift;
2775
2776	my $self = $class->SUPER::new (
2777	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778	@_,
2779	);
2780
2781	$self
2782	}
2783
2784	sub set_items {
2785	my ($self, $items) = @_;
2786
2787	$self->{scrolled}->clear;
2788	return unless $items;
2789
2790	my @items = sort {
2791	($a->{type} <=> $b->{type})
2792	or ($a->{name} cmp $b->{name})
2793	} @$items;
2794
2795	$self->{real_items} = \@items;
2796
2797	my $row = 0;
2798	for my $item (@items) {
2799	CFClient::Item::update_widgets $item;
2800
2801	$self->{scrolled}->add (0, $row, $item->{face_widget});
2802	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2803	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805	$row++;
2806	}
2807	}
2808		2878
2809	#############################################################################	2879	#############################################################################
2810		2880
2811	package CFClient::UI::Menu;	2881	package CFClient::UI::Menu;
2812		2882
…		…
2853	# maybe save $GRAB? must be careful about events...	2923	# maybe save $GRAB? must be careful about events...
2854	$GRAB = $self;	2924	$GRAB = $self;
2855	$self->{button} = $ev->{button};	2925	$self->{button} = $ev->{button};
2856		2926
2857	$self->show;	2927	$self->show;
2858	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2928	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2859	}	2929	}
2860		2930
2861	sub mouse_motion {	2931	sub mouse_motion {
2862	my ($self, $ev, $x, $y) = @_;	2932	my ($self, $ev, $x, $y) = @_;
2863		2933
2864	# TODO: should use vbox->find_widget or so	2934	# TODO: should use vbox->find_widget or so
2865	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2935	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2866	$self->{hover} = $self->{item}{$HOVER};	2936	$self->{hover} = $self->{item}{$HOVER};
		2937
		2938	0
2867	}	2939	}
2868		2940
2869	sub button_up {	2941	sub button_up {
2870	my ($self, $ev, $x, $y) = @_;	2942	my ($self, $ev, $x, $y) = @_;
2871		2943
…		…
2873	undef $GRAB;	2945	undef $GRAB;
2874	$self->hide;	2946	$self->hide;
2875		2947
2876	$self->_emit ("popdown");	2948	$self->_emit ("popdown");
2877	$self->{hover}[1]->() if $self->{hover};	2949	$self->{hover}[1]->() if $self->{hover};
		2950	} else {
		2951	return 0
		2952	}
		2953
		2954	1
		2955	}
		2956
		2957	#############################################################################
		2958
		2959	package CFClient::UI::Multiplexer;
		2960
		2961	our @ISA = CFClient::UI::Container::;
		2962
		2963	sub new {
		2964	my $class = shift;
		2965
		2966	my $self = $class->SUPER::new (
		2967	@_,
		2968	);
		2969
		2970	$self->{current} = $self->{children}[0]
		2971	if @{ $self->{children} };
		2972
		2973	$self
		2974	}
		2975
		2976	sub add {
		2977	my ($self, @widgets) = @_;
		2978
		2979	$self->SUPER::add (@widgets);
		2980
		2981	$self->{current} = $self->{children}[0]
		2982	if @{ $self->{children} };
		2983	}
		2984
		2985	sub set_current_page {
		2986	my ($self, $page_or_widget) = @_;
		2987
		2988	my $widget = ref $page_or_widget
		2989	? $page_or_widget
		2990	: $self->{children}[$page_or_widget];
		2991
		2992	$self->{current} = $widget;
		2993	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2994
		2995	$self->_emit (page_changed => $self->{current});
		2996
		2997	$self->realloc;
		2998	}
		2999
		3000	sub visible_children {
		3001	$_[0]{current}
		3002	}
		3003
		3004	sub size_request {
		3005	my ($self) = @_;
		3006
		3007	$self->{current}->size_request
		3008	}
		3009
		3010	sub size_allocate {
		3011	my ($self, $w, $h) = @_;
		3012
		3013	$self->{current}->configure (0, 0, $w, $h);
		3014	}
		3015
		3016	sub _draw {
		3017	my ($self) = @_;
		3018
		3019	$self->{current}->draw;
		3020	}
		3021
		3022	#############################################################################
		3023
		3024	package CFClient::UI::Notebook;
		3025
		3026	our @ISA = CFClient::UI::VBox::;
		3027
		3028	sub new {
		3029	my $class = shift;
		3030
		3031	my $self = $class->SUPER::new (
		3032	buttonbar => (new CFClient::UI::Buttonbar),
		3033	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3034	# filter => # will be put between multiplexer and $self
		3035	@_,
		3036	);
2878	}	3037
		3038	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3039	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3040
		3041	$self
		3042	}
		3043
		3044	sub add {
		3045	my ($self, $title, $widget, $tooltip) = @_;
		3046
		3047	Scalar::Util::weaken $self;
		3048
		3049	$self->{buttonbar}->add (new CFClient::UI::Button
		3050	markup => $title,
		3051	tooltip => $tooltip,
		3052	on_activate => sub { $self->set_current_page ($widget) },
		3053	);
		3054
		3055	$self->{multiplexer}->add ($widget);
		3056	}
		3057
		3058	sub set_current_page {
		3059	my ($self, $page) = @_;
		3060
		3061	$self->{multiplexer}->set_current_page ($page);
		3062	$self->_emit (page_changed => $self->{multiplexer}{current});
2879	}	3063	}
2880		3064
2881	#############################################################################	3065	#############################################################################
2882		3066
2883	package CFClient::UI::Statusbox;	3067	package CFClient::UI::Statusbox;
…		…
2988	$self->SUPER::reconfigure;	3172	$self->SUPER::reconfigure;
2989	}	3173	}
2990		3174
2991	#############################################################################	3175	#############################################################################
2992		3176
		3177	package CFClient::UI::Inventory;
		3178
		3179	our @ISA = CFClient::UI::ScrolledWindow::;
		3180
		3181	sub new {
		3182	my $class = shift;
		3183
		3184	my $self = $class->SUPER::new (
		3185	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3186	@_,
		3187	);
		3188
		3189	$self
		3190	}
		3191
		3192	sub set_items {
		3193	my ($self, $items) = @_;
		3194
		3195	$self->{child}->clear;
		3196	return unless $items;
		3197
		3198	my @items = sort {
		3199	($a->{type} <=> $b->{type})
		3200	or ($a->{name} cmp $b->{name})
		3201	} @$items;
		3202
		3203	$self->{real_items} = \@items;
		3204
		3205	my $row = 0;
		3206	for my $item (@items) {
		3207	CFClient::Item::update_widgets $item;
		3208
		3209	$self->{child}->add (0, $row, $item->{face_widget});
		3210	$self->{child}->add (1, $row, $item->{desc_widget});
		3211	$self->{child}->add (2, $row, $item->{weight_widget});
		3212
		3213	$row++;
		3214	}
		3215	}
		3216
		3217	#############################################################################
		3218
		3219	package CFClient::UI::BindEditor;
		3220
		3221	our @ISA = CFClient::UI::FancyFrame::;
		3222
		3223	sub new {
		3224	my $class = shift;
		3225
		3226	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3227
		3228	$self->add (my $vb = new CFClient::UI::VBox);
		3229
		3230
		3231	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3232	text => "start recording",
		3233	tooltip => "Start/Stops recording of actions."
		3234	."All subsequent actions after the recording started will be captured."
		3235	."The actions are displayed after the record was stopped."
		3236	."To bind the action you have to click on the 'Bind' button",
		3237	on_activate => sub {
		3238	unless ($self->{recording}) {
		3239	$self->start;
		3240	} else {
		3241	$self->stop;
		3242	}
		3243	});
		3244
		3245	$vb->add (new CFClient::UI::Label text => "Actions:");
		3246	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3247
		3248	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3249	$vb->add (my $hb = new CFClient::UI::HBox);
		3250	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3251	$hb->add (new CFClient::UI::Button
		3252	text => "bind",
		3253	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3254	on_activate => sub {
		3255	$self->ask_for_bind;
		3256	});
		3257
		3258	$vb->add (my $hb = new CFClient::UI::HBox);
		3259	$hb->add (new CFClient::UI::Button
		3260	text => "ok",
		3261	expand => 1,
		3262	tooltip => "This closes the binding editor and saves the binding",
		3263	on_activate => sub {
		3264	$self->hide;
		3265	$self->commit;
		3266	});
		3267
		3268	$hb->add (new CFClient::UI::Button
		3269	text => "cancel",
		3270	expand => 1,
		3271	tooltip => "This closes the binding editor without saving",
		3272	on_activate => sub {
		3273	$self->hide;
		3274	$self->{binding_cancel}->()
		3275	if $self->{binding_cancel};
		3276	});
		3277
		3278	$self->update_binding_widgets;
		3279
		3280	$self
		3281	}
		3282
		3283	sub commit {
		3284	my ($self) = @_;
		3285	my ($mod, $sym, $cmds) = $self->get_binding;
		3286	if ($sym != 0 && @$cmds > 0) {
		3287	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3288	."'. Don't forget 'Save Config'!");
		3289	$self->{binding_change}->($mod, $sym, $cmds)
		3290	if $self->{binding_change};
		3291	} else {
		3292	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3293	$self->{binding_cancel}->()
		3294	if $self->{binding_cancel};
		3295	}
		3296	}
		3297
		3298	sub start {
		3299	my ($self) = @_;
		3300
		3301	$self->{rec_btn}->set_text ("stop recording");
		3302	$self->{recording} = 1;
		3303	$self->clear_command_list;
		3304	$::CONN->start_record if $::CONN;
		3305	}
		3306
		3307	sub stop {
		3308	my ($self) = @_;
		3309
		3310	$self->{rec_btn}->set_text ("start recording");
		3311	$self->{recording} = 0;
		3312
		3313	my $rec;
		3314	$rec = $::CONN->stop_record if $::CONN;
		3315	return unless ref $rec eq 'ARRAY';
		3316	$self->set_command_list ($rec);
		3317	}
		3318
		3319
		3320	sub ask_for_bind_and_commit {
		3321	my ($self) = @_;
		3322	$self->ask_for_bind (1);
		3323	}
		3324
		3325	sub ask_for_bind {
		3326	my ($self, $commit) = @_;
		3327
		3328	CFClient::Binder::open_binding_dialog (sub {
		3329	my ($mod, $sym) = @_;
		3330	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3331	$self->update_binding_widgets;
		3332	$self->commit if $commit;
		3333	});
		3334	}
		3335
		3336	# $mod and $sym are the modifiers and key symbol
		3337	# $cmds is a array ref of strings (the commands)
		3338	# $cb is the callback that is executed on OK
		3339	# $ccb is the callback that is executed on CANCEL and
		3340	# when the binding was unsuccessful on OK
		3341	sub set_binding {
		3342	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3343
		3344	$self->clear_command_list;
		3345	$self->{recording} = 0;
		3346	$self->{rec_btn}->set_text ("start recording");
		3347
		3348	$self->{binding} = [$mod, $sym];
		3349	$self->{commands} = $cmds;
		3350
		3351	$self->{binding_change} = $cb;
		3352	$self->{binding_cancel} = $ccb;
		3353
		3354	$self->update_binding_widgets;
		3355	}
		3356
		3357	# this is a shortcut method that asks for a binding
		3358	# and then just binds it.
		3359	sub do_quick_binding {
		3360	my ($self, $cmds) = @_;
		3361	$self->set_binding (undef, undef, $cmds, sub {
		3362	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3363	});
		3364	$self->ask_for_bind (1);
		3365	}
		3366
		3367	sub update_binding_widgets {
		3368	my ($self) = @_;
		3369	my ($mod, $sym, $cmds) = $self->get_binding;
		3370	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3371	$self->set_command_list ($cmds);
		3372	}
		3373
		3374	sub get_binding {
		3375	my ($self) = @_;
		3376	return (
		3377	$self->{binding}->[0],
		3378	$self->{binding}->[1],
		3379	[ grep { defined $_ } @{$self->{commands}} ]
		3380	);
		3381	}
		3382
		3383	sub clear_command_list {
		3384	my ($self) = @_;
		3385	$self->{cmdbox}->clear ();
		3386	}
		3387
		3388	sub set_command_list {
		3389	my ($self, $cmds) = @_;
		3390
		3391	$self->{cmdbox}->clear ();
		3392	$self->{commands} = $cmds;
		3393
		3394	my $idx = 0;
		3395
		3396	for (@$cmds) {
		3397	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3398
		3399	my $i = $idx;
		3400	$hb->add (new CFClient::UI::Label text => $_);
		3401	$hb->add (new CFClient::UI::Button
		3402	text => "delete",
		3403	tooltip => "Deletes the action from the record",
		3404	on_activate => sub {
		3405	$self->{cmdbox}->remove ($hb);
		3406	$cmds->[$i] = undef;
		3407	});
		3408
		3409
		3410	$idx++
		3411	}
		3412	}
		3413
		3414	#############################################################################
		3415
		3416	package CFClient::UI::SpellList;
		3417
		3418	our @ISA = CFClient::UI::Table::;
		3419
		3420	sub new {
		3421	my $class = shift;
		3422
		3423	my $self = $class->SUPER::new (
		3424	binding => [],
		3425	commands => [],
		3426	@_,
		3427	)
		3428	}
		3429
		3430	# XXX: Do sorting? Argl...
		3431	sub add_spell {
		3432	my ($self, $spell) = @_;
		3433	$self->{spells}->{$spell->{name}} = $spell;
		3434
		3435	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3436	face => $spell->{face},
		3437	can_hover => 1,
		3438	can_events => 1,
		3439	tooltip => $spell->{message});
		3440
		3441	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3442	text => $spell->{name},
		3443	can_hover => 1,
		3444	can_events => 1,
		3445	tooltip => $spell->{message},
		3446	expand => 1);
		3447
		3448	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3449	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3450	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3451	expand => 1);
		3452
		3453	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3454	text => "bind to key",
		3455	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3456	}
		3457
		3458	sub rebuild_spell_list {
		3459	my ($self) = @_;
		3460	$self->{tbl_idx} = 0;
		3461	$self->add_spell ($_) for values %{$self->{spells}};
		3462	}
		3463
		3464	sub remove_spell {
		3465	my ($self, $spell) = @_;
		3466	delete $self->{spells}->{$spell->{name}};
		3467	$self->rebuild_spell_list;
		3468	}
		3469
		3470	#############################################################################
		3471
2993	package CFClient::UI::Root;	3472	package CFClient::UI::Root;
2994		3473
2995	our @ISA = CFClient::UI::Container::;	3474	our @ISA = CFClient::UI::Container::;
2996		3475
2997	use CFClient::OpenGL;	3476	use CFClient::OpenGL;
…		…
3007	Scalar::Util::weaken ($self->{root} = $self);	3486	Scalar::Util::weaken ($self->{root} = $self);
3008		3487
3009	$self	3488	$self
3010	}	3489	}
3011		3490
3012	sub configure {
3013	my ($self, $x, $y, $w, $h) = @_;
3014
3015	$self->{w} = $w;
3016	$self->{h} = $h;
3017	}
3018
3019	sub reconfigure {
3020	my ($self) = @_;
3021
3022	$self->SUPER::reconfigure;
3023
3024	$self->size_allocate ($self->{w}, $self->{h}, 1)
3025	if $self->{w};
3026	}
3027
3028	sub size_request {	3491	sub size_request {
3029	my ($self) = @_;	3492	my ($self) = @_;
3030		3493
3031	($self->{w}, $self->{h})	3494	($self->{w}, $self->{h})
3032	}	3495	}
3033		3496
		3497	sub _to_pixel {
		3498	my ($coord, $size, $max) = @_;
		3499
		3500	$coord =
		3501	$coord eq "center" ? ($max - $size) * 0.5
		3502	: $coord eq "max" ? $max
		3503	: $coord;
		3504
		3505	$coord = 0 if $coord < 0;
		3506	$coord = $max - $size if $coord > $max - $size;
		3507
		3508	int $coord + 0.5
		3509	}
		3510
3034	sub size_allocate {	3511	sub size_allocate {
3035	my ($self, $w, $h, $changed) = @_;	3512	my ($self, $w, $h) = @_;
3036		3513
3037	for my $child ($self->children) {	3514	for my $child ($self->children) {
3038	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3515	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3039		3516
3040	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3517	$X = $child->{force_x} if exists $child->{force_x};
3041	if exists $child->{req_x};	3518	$Y = $child->{force_y} if exists $child->{force_y};
3042		3519
3043	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3520	$X = _to_pixel $X, $W, $self->{w};
3044	if exists $child->{req_y};	3521	$Y = _to_pixel $Y, $H, $self->{h};
3045
3046	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
3047
3048	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050		3522
3051	$child->configure ($X, $Y, $W, $H);	3523	$child->configure ($X, $Y, $W, $H);
3052	}	3524	}
3053	}	3525	}
3054		3526
…		…
3071	}	3543	}
3072		3544
3073	sub add {	3545	sub add {
3074	my ($self, @children) = @_;	3546	my ($self, @children) = @_;
3075		3547
3076	for my $child (@children) {
3077	$child->{is_toplevel} = 1;	3548	$_->{is_toplevel} = 1
3078		3549	for @children;
3079	# integerise window positions
3080	$child->{x} = int $child->{x};
3081	$child->{y} = int $child->{y};
3082	}
3083		3550
3084	$self->SUPER::add (@children);	3551	$self->SUPER::add (@children);
3085	}	3552	}
3086		3553
3087	sub remove {	3554	sub remove {
3088	my ($self, @children) = @_;	3555	my ($self, @children) = @_;
3089		3556
3090	$self->SUPER::remove (@children);	3557	$self->SUPER::remove (@children);
		3558
		3559	delete $self->{is_toplevel}
		3560	for @children;
3091		3561
3092	while (@children) {	3562	while (@children) {
3093	my $w = pop @children;	3563	my $w = pop @children;
3094	push @children, $w->children;	3564	push @children, $w->children;
3095	$w->set_invisible;	3565	$w->set_invisible;
…		…
3115	$_->()	3585	$_->()
3116	for values %{delete $self->{refresh_hook}};	3586	for values %{delete $self->{refresh_hook}};
3117	}	3587	}
3118		3588
3119	if ($self->{realloc}) {	3589	if ($self->{realloc}) {
		3590	my %queue;
3120	my @queue;	3591	my @queue;
		3592	my $widget;
3121		3593
		3594	outer:
3122	while () {	3595	while () {
3123	if ($self->{realloc}) {	3596	if (my $realloc = delete $self->{realloc}) {
3124	#TODO use array-of-depth approach	3597	for $widget (values %$realloc) {
		3598	$widget->{visible} or next; # do not resize invisible widgets
3125		3599
3126	@queue = sort { $a->{visible} <=> $b->{visible} }	3600	$queue{$widget+0}++ and next; # duplicates are common
3127	@queue, values %{delete $self->{realloc}};	3601
		3602	push @{ $queue[$widget->{visible}] }, $widget;
		3603	}
3128	}	3604	}
3129		3605
		3606	while () {
		3607	@queue or last outer;
		3608
		3609	$widget = pop @{ $queue[-1] || [] }
		3610	and last;
		3611
		3612	pop @queue;
		3613	}
		3614
		3615	delete $queue{$widget+0};
		3616
		3617	my ($w, $h) = $widget->size_request;
		3618
		3619	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3620	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3621
		3622	$w = $widget->{force_w} if exists $widget->{force_w};
		3623	$h = $widget->{force_h} if exists $widget->{force_h};
		3624
		3625	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3626	|| delete $widget->{force_realloc}) {
		3627	$widget->{req_w} = $w;
		3628	$widget->{req_h} = $h;
		3629
		3630	$self->{size_alloc}{$widget+0} = $widget;
		3631
		3632	if (my $parent = $widget->{parent}) {
		3633	$self->{realloc}{$parent+0} = $parent
		3634	unless $queue{$parent+0};
		3635
		3636	$parent->{force_size_alloc} = 1;
		3637	$self->{size_alloc}{$parent+0} = $parent;
		3638	}
		3639	}
		3640
		3641	delete $self->{realloc}{$widget+0};
		3642	}
		3643	}
		3644
		3645	while (my $size_alloc = delete $self->{size_alloc}) {
		3646	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3647	values %$size_alloc;
		3648
		3649	while () {
3130	my $widget = pop @queue || last;	3650	my $widget = pop @queue || last;
3131		3651
3132	$widget->{visible} or last; # do not resize invisible widgets	3652	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3133
3134	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3135	? @$widget{qw(def_w def_h)}
3136	: $widget->size_request;
3137
3138	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3139
3140	$widget->{req_w} = $w;
3141	$widget->{req_h} = $h;
3142
3143	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3144
3145	push @queue, $widget->{parent}
3146	if $widget->{parent};
3147	}
3148	}
3149
3150	while (my $size_alloc = delete $self->{size_alloc}) {
3151	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3152	values %$size_alloc;
3153
3154	while () {
3155	my ($widget, $w, $h) = @{ pop @queue or last };
3156		3653
3157	$w = 0 if $w < 0;	3654	$w = 0 if $w < 0;
3158	$h = 0 if $h < 0;	3655	$h = 0 if $h < 0;
3159		3656
3160	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3657	$w = int $w + 0.5;
		3658	$h = int $h + 0.5;
3161		3659
		3660	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3661	$widget->{old_w} = $widget->{w};
		3662	$widget->{old_h} = $widget->{h};
		3663
3162	$widget->{w} = $w;	3664	$widget->{w} = $w;
3163	$widget->{h} = $h;	3665	$widget->{h} = $h;
3164		3666
3165	$widget->emit (size_allocate => $w, $h, $changed);	3667	$widget->emit (size_allocate => $w, $h);
		3668	}
3166	}	3669	}
3167	}	3670	}
3168		3671
3169	while ($self->{post_alloc_hook}) {	3672	while ($self->{post_alloc_hook}) {
3170	$_->()	3673	$_->()
3171	for values %{delete $self->{post_alloc_hook}};	3674	for values %{delete $self->{post_alloc_hook}};
3172	}	3675	}
		3676
3173		3677
3174	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3678	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3175	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3679	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3176	glClear GL_COLOR_BUFFER_BIT;	3680	glClear GL_COLOR_BUFFER_BIT;
3177		3681
…		…
3179	glLoadIdentity;	3683	glLoadIdentity;
3180	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3684	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3181	glMatrixMode GL_MODELVIEW;	3685	glMatrixMode GL_MODELVIEW;
3182	glLoadIdentity;	3686	glLoadIdentity;
3183		3687
		3688	{
		3689	package CFClient::UI::Base;
		3690
		3691	($draw_x, $draw_y, $draw_w, $draw_h) =
		3692	(0, 0, $self->{w}, $self->{h});
		3693	}
		3694
3184	$self->_draw;	3695	$self->_draw;
3185	}	3696	}
3186		3697
3187	#############################################################################	3698	#############################################################################
3188		3699

Diff Legend

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