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.253 by root, Sun May 28 23:28:12 2006 UTC vs.
Revision 1.276 by root, Sun Jun 4 00:16:01 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	#############################################################################
		798
		799	# back-buffered drawing area
761		800
762	package CFClient::UI::Window;	801	package CFClient::UI::Window;
763		802
764	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
765		804
…		…
777	$ROOT->on_post_alloc ($self => sub { $self->render_child });	816	$ROOT->on_post_alloc ($self => sub { $self->render_child });
778	$self->SUPER::update;	817	$self->SUPER::update;
779	}	818	}
780		819
781	sub size_allocate {	820	sub size_allocate {
782	my ($self, $w, $h, $changed) = @_;	821	my ($self, $w, $h) = @_;
783		822
784	$self->SUPER::size_allocate ($w, $h, $changed);	823	$self->SUPER::size_allocate ($w, $h);
785	$self->update	824	$self->update;
786	if $changed;
787	}	825	}
788		826
789	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
790	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
791	}	831	}
792		832
793	sub render_child {	833	sub render_child {
794	my ($self) = @_;	834	my ($self) = @_;
795		835
796	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	836	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
798	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
799		839
		840	{
		841	package CFClient::UI::Base;
		842
		843	($draw_x, $draw_y, $draw_w, $draw_h) =
		844	(0, 0, $self->{w}, $self->{h});
		845	}
		846
800	$self->_render;	847	$self->_render;
801	};	848	};
802	}	849	}
803		850
804	sub _draw {	851	sub _draw {
805	my ($self) = @_;	852	my ($self) = @_;
806		853
807	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
808		855
809	my $tex = $self->{texture}	856	my $tex = $self->{texture}
810	or return;	857	or return;
811		858
812	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
835	}	882	}
836		883
837	sub size_request {	884	sub size_request {
838	my ($self) = @_;	885	my ($self) = @_;
839		886
840	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	887	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841		888
842	$w = 10 if $self->{scroll_x};	889	$w = 10 if $self->{scroll_x};
843	$h = 10 if $self->{scroll_y};	890	$h = 10 if $self->{scroll_y};
844		891
845	($w, $h)	892	($w, $h)
846	}	893	}
847		894
848	sub size_allocate {	895	sub size_allocate {
849	my ($self, $w, $h, $changed) = @_;	896	my ($self, $w, $h) = @_;
850		897
		898	my $child = $self->child;
		899
851	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853		902
854	$self->child->configure (0, 0, $w, $h);	903	$self->child->configure (0, 0, $w, $h);
855	$self->update;	904	$self->update;
856	}	905	}
857		906
…		…
893	}	942	}
894		943
895	sub _render {	944	sub _render {
896	my ($self) = @_;	945	my ($self) = @_;
897		946
		947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		949
898	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899		951
900	$self->SUPER::_render;	952	$self->SUPER::_render;
901	}	953	}
902		954
…		…
905	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
906		958
907	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
908		960
909	sub new {	961	sub new {
910	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
911		965
912	my $self;	966	my $self;
913		967
914	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
915	vertical => 1,	969	vertical => 1,
…		…
920	;	974	;
921		975
922	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
923	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
924	slider => $slider,	978	slider => $slider,
925	@_,	979	%arg,
926	);	980	);
927		981
928	$self->{vp}->add ($self->{scrolled});
929	$self->add ($self->{vp});
930	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
931		984
932	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
933	}	992	}
934		993
935	sub update {	994	sub update {
936	my ($self) = @_;	995	my ($self) = @_;
937		996
…		…
941	my $child = $self->{vp}->child;	1000	my $child = $self->{vp}->child;
942	$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]);
943	}	1002	}
944		1003
945	sub size_allocate {	1004	sub size_allocate {
946	my ($self, $w, $h, $changed) = @_;	1005	my ($self, $w, $h) = @_;
947		1006
948	$self->SUPER::size_allocate ($w, $h, $changed);	1007	$self->SUPER::size_allocate ($w, $h);
949		1008
950	my $child = $self->{vp}->child;	1009	my $child = $self->{vp}->child;
951	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1010	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
952	}	1011	}
953		1012
…		…
1000		1059
1001	our @ISA = CFClient::UI::Bin::;	1060	our @ISA = CFClient::UI::Bin::;
1002		1061
1003	use CFClient::OpenGL;	1062	use CFClient::OpenGL;
1004		1063
1005	my @tex =	1064	my $bg =
		1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1066	mipmap => 1, wrap => 1;
		1067
		1068	my @border =
1006	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	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);	1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1008		1071
1009	sub new {	1072	sub new {
1010	my $class = shift;	1073	my ($class, %arg) = @_;
		1074
		1075	my $title = delete $arg{title};
1011		1076
1012	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
1013	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
1014	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
1015	border => 0.6,	1080	border => 0.6,
1016	is_toplevel => 1,
1017	can_events => 1,	1081	can_events => 1,
1018	@_	1082	min_w => 16,
		1083	min_h => 16,
		1084	%arg,
1019	);	1085	);
1020		1086
1021	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
1022	align => 0,	1088	align => 0,
1023	valign => 1,	1089	valign => 1,
1024	text => $self->{title},	1090	text => $title,
1025	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
1026		1093
1027	$self	1094	$self
		1095	}
		1096
		1097	sub add {
		1098	my ($self, @widgets) = @_;
		1099
		1100	$self->SUPER::add (@widgets);
		1101	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1028	}	1102	}
1029		1103
1030	sub border {	1104	sub border {
1031	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
1032	}	1106	}
1033		1107
1034	sub size_request {	1108	sub size_request {
1035	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
1036		1113
1037	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
1038		1115
1039	(	1116	(
1040	$w + $self->border * 2,	1117	$w + $self->border * 2,
1041	$h + $self->border * 2,	1118	$h + $self->border * 2,
1042	)	1119	)
1043	}	1120	}
1044		1121
1045	sub size_allocate {	1122	sub size_allocate {
1046	my ($self, $w, $h, $changed) = @_;	1123	my ($self, $w, $h) = @_;
1047		1124
1048	return unless $changed;	1125	if ($self->{title}) {
		1126	$self->{title}{w} = $w;
		1127	$self->{title}{h} = $h;
		1128	$self->{title}->size_allocate ($w, $h);
		1129	}
1049		1130
		1131	my $border = $self->border;
		1132
1050	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
1051	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
1052		1135
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);	1136	$self->child->configure ($border, $border, $w, $h);
1057	}	1137	}
1058		1138
1059	sub button_down {	1139	sub button_down {
1060	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
1061		1141
…		…
1077	my ($ev, $x, $y) = @_;	1157	my ($ev, $x, $y) = @_;
1078		1158
1079	my $dx = $ev->{x} - $ox;	1159	my $dx = $ev->{x} - $ox;
1080	my $dy = $ev->{y} - $oy;	1160	my $dy = $ev->{y} - $oy;
1081		1161
1082	$self->{user_x} = $wx + $dx * $mx;
1083	$self->{user_y} = $wy + $dy * $my;
1084	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086	$self->move ($self->{user_x}, $self->{user_y});	1164
1087	$self->realloc;	1165	$self->realloc;
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1088	};	1167	};
1089		1168
1090	} elsif ($lr ^ $td) {	1169	} elsif ($lr ^ $td) {
1091	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1092	my ($bx, $by) = ($self->{x}, $self->{y});	1171	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1094	$self->{motion} = sub {	1173	$self->{motion} = sub {
1095	my ($ev, $x, $y) = @_;	1174	my ($ev, $x, $y) = @_;
1096		1175
1097	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
1098		1177
1099	$self->{user_x} = $bx + $x - $ox;	1178	$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	};	1179	};
		1180	} else {
		1181	return 0;
		1182	}
		1183
1105	}	1184	1
1106	}	1185	}
1107		1186
1108	sub button_up {	1187	sub button_up {
1109	my ($self, $ev, $x, $y) = @_;	1188	my ($self, $ev, $x, $y) = @_;
1110		1189
1111	delete $self->{motion};	1190	!!delete $self->{motion}
1112	}	1191	}
1113		1192
1114	sub mouse_motion {	1193	sub mouse_motion {
1115	my ($self, $ev, $x, $y) = @_;	1194	my ($self, $ev, $x, $y) = @_;
1116		1195
1117	$self->{motion}->($ev, $x, $y) if $self->{motion};	1196	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1197
		1198	!!$self->{motion}
1118	}	1199	}
1119		1200
1120	sub _draw {	1201	sub _draw {
1121	my ($self) = @_;	1202	my ($self) = @_;
1122		1203
		1204	my $child = $self->{children}[0];
		1205
1123	my ($w, $h ) = ($self->{w}, $self->{h});	1206	my ($w, $h ) = ($self->{w}, $self->{h});
1124	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1207	my ($cw, $ch) = ($child->{w}, $child->{h});
1125		1208
1126	glEnable GL_TEXTURE_2D;	1209	glEnable GL_TEXTURE_2D;
1127	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128		1211
1129	my $border = $self->border;	1212	my $border = $self->border;
1130		1213
1131	glColor @{ $self->{border_bg} };	1214	glColor @{ $self->{border_bg} };
1132	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1215	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1133	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1216	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1217	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1218	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136		1219
1137	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1220	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138	my $bg = $tex[0];	1221	glColor @{ $self->{bg} };
1139		1222
1140	# TODO: repeat texture not scale	1223	# TODO: repeat texture not scale
		1224	# solve this better(?)
1141	my $rep_x = $cw / $bg->{w};	1225	$bg->{s} = $cw / $bg->{w};
1142	my $rep_y = $ch / $bg->{h};	1226	$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);	1227	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150	}	1228	}
1151		1229
1152	glDisable GL_TEXTURE_2D;	1230	glDisable GL_TEXTURE_2D;
1153		1231
1154	$self->{title}->draw if $self->{title};
1155
1156	$self->child->draw;	1232	$child->draw;
		1233
		1234	if ($self->{title}) {
		1235	glTranslate 0, $border - $self->{h};
		1236	$self->{title}->_draw;
		1237	}
1157	}	1238	}
1158		1239
1159	#############################################################################	1240	#############################################################################
1160		1241
1161	package CFClient::UI::Table;	1242	package CFClient::UI::Table;
…		…
1235	(sum @$hs),	1316	(sum @$hs),
1236	)	1317	)
1237	}	1318	}
1238		1319
1239	sub size_allocate {	1320	sub size_allocate {
1240	my ($self, $w, $h, $changed) = @_;	1321	my ($self, $w, $h) = @_;
1241		1322
1242	my ($ws, $hs) = $self->get_wh;	1323	my ($ws, $hs) = $self->get_wh;
1243		1324
1244	my $req_w = (sum @$ws) || 1;	1325	my $req_w = (sum @$ws) || 1;
1245	my $req_h = (sum @$hs) || 1;	1326	my $req_h = (sum @$hs) || 1;
…		…
1323	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1404	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1324	)	1405	)
1325	}	1406	}
1326		1407
1327	sub size_allocate {	1408	sub size_allocate {
1328	my ($self, $w, $h, $changed) = @_;	1409	my ($self, $w, $h) = @_;
1329		1410
1330	my $space = $self->{vertical} ? $h : $w;	1411	my $space = $self->{vertical} ? $h : $w;
1331	my $children = $self->{children};	1412	my $children = $self->{children};
1332		1413
1333	my @req;	1414	my @req;
…		…
1416	ellipsise => 3, # end	1497	ellipsise => 3, # end
1417	layout => (new CFClient::Layout),	1498	layout => (new CFClient::Layout),
1418	fontsize => 1,	1499	fontsize => 1,
1419	align => -1,	1500	align => -1,
1420	valign => -1,	1501	valign => -1,
1421	padding => 2,	1502	padding_x => 2,
		1503	padding_y => 2,
1422	can_events => 0,	1504	can_events => 0,
1423	%arg	1505	%arg
1424	);	1506	);
1425		1507
1426	if (exists $self->{template}) {	1508	if (exists $self->{template}) {
…		…
1502		1584
1503	$w = List::Util::max $w, $w2;	1585	$w = List::Util::max $w, $w2;
1504	$h = List::Util::max $h, $h2;	1586	$h = List::Util::max $h, $h2;
1505	}	1587	}
1506		1588
1507	(	1589	($w, $h)
1508	$w + $self->{padding} * 2,
1509	$h + $self->{padding} * 2,
1510	)
1511	}	1590	}
1512		1591
1513	sub size_allocate {	1592	sub size_allocate {
1514	my ($self, $w, $h, $changed) = @_;	1593	my ($self, $w, $h) = @_;
		1594
		1595	delete $self->{ox};
1515		1596
1516	delete $self->{texture}	1597	delete $self->{texture}
1517	if $changed;	1598	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1518	}	1599	}
1519		1600
1520	sub set_fontsize {	1601	sub set_fontsize {
1521	my ($self, $fontsize) = @_;	1602	my ($self, $fontsize) = @_;
1522		1603
…		…
1537	$self->{layout}->set_width ($self->{w});	1618	$self->{layout}->set_width ($self->{w});
1538	$self->{layout}->set_ellipsise ($self->{ellipsise});	1619	$self->{layout}->set_ellipsise ($self->{ellipsise});
1539	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1620	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541		1622
1542	my $tex = new_from_layout CFClient::Texture $self->{layout};	1623	new_from_layout CFClient::Texture $self->{layout}
		1624	};
1543		1625
		1626	unless (exists $self->{ox}) {
1544	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1627	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1545	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1628	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1546	: ($self->{w} - $tex->{w}) * 0.5);	1629	: ($self->{w} - $tex->{w}) * 0.5);
1547		1630
1548	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1631	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1549	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1632	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1550	: ($self->{h} - $tex->{h}) * 0.5);	1633	: ($self->{h} - $tex->{h}) * 0.5);
1551
1552	$tex
1553	};	1634	};
1554		1635
1555	glEnable GL_TEXTURE_2D;	1636	glEnable GL_TEXTURE_2D;
1556	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1557		1638
…		…
1595		1676
1596	delete $self->{cur_h};	1677	delete $self->{cur_h};
1597		1678
1598	return if $self->{text} eq $text;	1679	return if $self->{text} eq $text;
1599		1680
1600	delete $self->{texture};
1601
1602	$self->{last_activity} = $::NOW;	1681	$self->{last_activity} = $::NOW;
1603	$self->{text} = $text;	1682	$self->{text} = $text;
1604		1683
1605	$text =~ s/./*/g if $self->{hidden};	1684	$text =~ s/./*/g if $self->{hidden};
1606	$self->{layout}->set_text ("$text ");	1685	$self->{layout}->set_text ("$text ");
1607		1686
1608	$self->_emit (changed => $self->{text});	1687	$self->_emit (changed => $self->{text});
		1688	$self->update;
1609	}	1689	}
1610		1690
1611	sub set_text {	1691	sub set_text {
1612	my ($self, $text) = @_;	1692	my ($self, $text) = @_;
1613		1693
…		…
1652	$self->{cursor} = length $text;	1732	$self->{cursor} = length $text;
1653	} elsif ($uni == 27) {	1733	} elsif ($uni == 27) {
1654	$self->_emit ('escape');	1734	$self->_emit ('escape');
1655	} elsif ($uni) {	1735	} elsif ($uni) {
1656	substr $text, $self->{cursor}++, 0, chr $uni;	1736	substr $text, $self->{cursor}++, 0, chr $uni;
		1737	} else {
		1738	return 0;
1657	}	1739	}
1658		1740
1659	$self->_set_text ($text);	1741	$self->_set_text ($text);
1660		1742
1661	$self->realloc;	1743	$self->realloc;
		1744
		1745	1
1662	}	1746	}
1663		1747
1664	sub focus_in {	1748	sub focus_in {
1665	my ($self) = @_;	1749	my ($self) = @_;
1666		1750
…		…
1681	utf8::encode $text;	1765	utf8::encode $text;
1682	$self->{cursor} = length substr $text, 0, $idx;	1766	$self->{cursor} = length substr $text, 0, $idx;
1683		1767
1684	$self->_set_text ($self->{text});	1768	$self->_set_text ($self->{text});
1685	$self->update;	1769	$self->update;
		1770
		1771	1
1686	}	1772	}
1687		1773
1688	sub mouse_motion {	1774	sub mouse_motion {
1689	my ($self, $ev, $x, $y) = @_;	1775	my ($self, $ev, $x, $y) = @_;
1690	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1776	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1777
		1778	0
1691	}	1779	}
1692		1780
1693	sub _draw {	1781	sub _draw {
1694	my ($self) = @_;	1782	my ($self) = @_;
1695		1783
…		…
1772	} else {	1860	} else {
1773	$self->set_text ($self->{history_saveback});	1861	$self->set_text ($self->{history_saveback});
1774	}	1862	}
1775		1863
1776	} else {	1864	} else {
1777	$self->SUPER::key_down ($ev);	1865	return $self->SUPER::key_down ($ev)
		1866	}
		1867
1778	}	1868	1
1779
1780	}	1869	}
1781		1870
1782	#############################################################################	1871	#############################################################################
1783		1872
1784	package CFClient::UI::Button;	1873	package CFClient::UI::Button;
…		…
1793		1882
1794	sub new {	1883	sub new {
1795	my $class = shift;	1884	my $class = shift;
1796		1885
1797	$class->SUPER::new (	1886	$class->SUPER::new (
1798	padding => 4,	1887	padding_x => 4,
		1888	padding_y => 4,
1799	fg => [1, 1, 1],	1889	fg => [1, 1, 1],
1800	active_fg => [0, 0, 1],	1890	active_fg => [0, 0, 1],
1801	can_hover => 1,	1891	can_hover => 1,
1802	align => 0,	1892	align => 0,
1803	valign => 0,	1893	valign => 0,
…		…
1812	my ($self, $ev, $x, $y) = @_;	1902	my ($self, $ev, $x, $y) = @_;
1813		1903
1814	$self->emit ("activate")	1904	$self->emit ("activate")
1815	if $x >= 0 && $x < $self->{w}	1905	if $x >= 0 && $x < $self->{w}
1816	&& $y >= 0 && $y < $self->{h};	1906	&& $y >= 0 && $y < $self->{h};
		1907
		1908	1
1817	}	1909	}
1818		1910
1819	sub _draw {	1911	sub _draw {
1820	my ($self) = @_;	1912	my ($self) = @_;
1821		1913
…		…
1850		1942
1851	sub new {	1943	sub new {
1852	my $class = shift;	1944	my $class = shift;
1853		1945
1854	$class->SUPER::new (	1946	$class->SUPER::new (
1855	padding => 2,	1947	padding_x => 2,
		1948	padding_y => 2,
1856	fg => [1, 1, 1],	1949	fg => [1, 1, 1],
1857	active_fg => [1, 1, 0],	1950	active_fg => [1, 1, 0],
1858	bg => [0, 0, 0, 0.2],	1951	bg => [0, 0, 0, 0.2],
1859	active_bg => [1, 1, 1, 0.5],	1952	active_bg => [1, 1, 1, 0.5],
1860	state => 0,	1953	state => 0,
…		…
1864	}	1957	}
1865		1958
1866	sub size_request {	1959	sub size_request {
1867	my ($self) = @_;	1960	my ($self) = @_;
1868		1961
1869	($self->{padding} * 2 + 6) x 2	1962	(6) x 2
1870	}	1963	}
1871		1964
1872	sub button_down {	1965	sub button_down {
1873	my ($self, $ev, $x, $y) = @_;	1966	my ($self, $ev, $x, $y) = @_;
1874		1967
1875	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1968	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1969	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877	$self->{state} = !$self->{state};	1970	$self->{state} = !$self->{state};
1878	$self->_emit (changed => $self->{state});	1971	$self->_emit (changed => $self->{state});
		1972	} else {
		1973	return 0
		1974	}
		1975
1879	}	1976	1
1880	}	1977	}
1881		1978
1882	sub _draw {	1979	sub _draw {
1883	my ($self) = @_;	1980	my ($self) = @_;
1884		1981
1885	$self->SUPER::_draw;	1982	$self->SUPER::_draw;
1886		1983
1887	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1984	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888		1985
1889	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1986	my ($w, $h) = @$self{qw(w h)};
		1987
		1988	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1890		1989
1891	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1990	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892		1991
1893	my $tex = $self->{state} ? $tex[1] : $tex[0];	1992	my $tex = $self->{state} ? $tex[1] : $tex[0];
1894		1993
…		…
2159	fg => [1, 1, 1],	2258	fg => [1, 1, 1],
2160	active_fg => [0, 0, 0],	2259	active_fg => [0, 0, 0],
2161	bg => [0, 0, 0, 0.2],	2260	bg => [0, 0, 0, 0.2],
2162	active_bg => [1, 1, 1, 0.5],	2261	active_bg => [1, 1, 1, 0.5],
2163	range => [0, 0, 100, 10, 0],	2262	range => [0, 0, 100, 10, 0],
2164	req_w => $::WIDTH / 80,	2263	min_w => $::WIDTH / 80,
2165	req_h => $::WIDTH / 80,	2264	min_h => $::WIDTH / 80,
2166	vertical => 0,	2265	vertical => 0,
2167	can_hover => 1,	2266	can_hover => 1,
2168	inner_pad => 0.02,	2267	inner_pad => 0.02,
2169	@_	2268	@_
2170	);	2269	);
…		…
2210	}	2309	}
2211		2310
2212	sub size_request {	2311	sub size_request {
2213	my ($self) = @_;	2312	my ($self) = @_;
2214		2313
2215	my $w = $self->{req_w};	2314	($self->{req_w}, $self->{req_h})
2216	my $h = $self->{req_h};
2217
2218	$self->{vertical} ? ($h, $w) : ($w, $h)
2219	}	2315	}
2220		2316
2221	sub button_down {	2317	sub button_down {
2222	my ($self, $ev, $x, $y) = @_;	2318	my ($self, $ev, $x, $y) = @_;
2223		2319
2224	$self->SUPER::button_down ($ev, $x, $y);	2320	$self->SUPER::button_down ($ev, $x, $y);
2225		2321
2226	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2322	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227		2323
2228	$self->mouse_motion ($ev, $x, $y);	2324	$self->mouse_motion ($ev, $x, $y)
2229	}	2325	}
2230		2326
2231	sub mouse_motion {	2327	sub mouse_motion {
2232	my ($self, $ev, $x, $y) = @_;	2328	my ($self, $ev, $x, $y) = @_;
2233		2329
…		…
2237	my (undef, $lo, $hi, $page) = @{$self->{range}};	2333	my (undef, $lo, $hi, $page) = @{$self->{range}};
2238		2334
2239	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2335	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240		2336
2241	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2337	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2338	} else {
		2339	return 0;
		2340	}
		2341
2242	}	2342	1
2243	}	2343	}
2244		2344
2245	sub update {	2345	sub update {
2246	my ($self) = @_;	2346	my ($self) = @_;
2247		2347
2248	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2348	delete $self->{knob_w};
		2349	$self->SUPER::update;
		2350	}
		2351
		2352	sub _draw {
		2353	my ($self) = @_;
		2354
		2355	unless ($self->{knob_w}) {
2249	$self->set_value ($self->{range}[0]);	2356	$self->set_value ($self->{range}[0]);
2250		2357
2251	my ($value, $lo, $hi, $page) = @{$self->{range}};	2358	my ($value, $lo, $hi, $page) = @{$self->{range}};
2252	my $range = ($hi - $page - $lo) || 1e-100;	2359	my $range = ($hi - $page - $lo) || 1e-100;
2253		2360
…		…
2259	$value = ($value - $lo) / $range;	2366	$value = ($value - $lo) / $range;
2260	$value = $value * $self->{scale} + $self->{offset};	2367	$value = $value * $self->{scale} + $self->{offset};
2261		2368
2262	$self->{knob_x} = $value - $knob_w * 0.5;	2369	$self->{knob_x} = $value - $knob_w * 0.5;
2263	$self->{knob_w} = $knob_w;	2370	$self->{knob_w} = $knob_w;
2264	});	2371	}
2265
2266	$self->SUPER::update;
2267	}
2268
2269	sub _draw {
2270	my ($self) = @_;
2271		2372
2272	$self->SUPER::_draw ();	2373	$self->SUPER::_draw ();
2273		2374
2274	glScale $self->{w}, $self->{h};	2375	glScale $self->{w}, $self->{h};
2275		2376
…		…
2373	$self->{fontsize} = $fontsize;	2474	$self->{fontsize} = $fontsize;
2374	$self->reflow;	2475	$self->reflow;
2375	}	2476	}
2376		2477
2377	sub size_allocate {	2478	sub size_allocate {
2378	my ($self, $w, $h, $changed) = @_;	2479	my ($self, $w, $h) = @_;
2379		2480
2380	$self->SUPER::size_allocate ($w, $h, $changed);	2481	$self->SUPER::size_allocate ($w, $h);
2381
2382	return unless $changed;
2383		2482
2384	$self->{layout}->set_font ($self->{font}) if $self->{font};	2483	$self->{layout}->set_font ($self->{font}) if $self->{font};
2385	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2484	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386	$self->{layout}->set_width ($self->{children}[0]{w});	2485	$self->{layout}->set_width ($self->{children}[0]{w});
2387		2486
…		…
2610	}	2709	}
2611		2710
2612	sub set_tooltip_from {	2711	sub set_tooltip_from {
2613	my ($self, $widget) = @_;	2712	my ($self, $widget) = @_;
2614		2713
		2714	my $tooltip = $widget->{tooltip};
		2715
		2716	if ($ENV{CFPLUS_DEBUG} & 2) {
		2717	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2718	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2719	. "req $widget->{req_w} $widget->{req_h}\n"
		2720	. "visible $widget->{visible}";
		2721	}
		2722
2615	$self->add (new CFClient::UI::Label	2723	$self->add (new CFClient::UI::Label
2616	markup => $widget->{tooltip},	2724	markup => $tooltip,
2617	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2725	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618	fontsize => 0.8,	2726	fontsize => 0.8,
2619	fg => [0, 0, 0, 1],	2727	fg => [0, 0, 0, 1],
2620	ellipsise => 0,	2728	ellipsise => 0,
2621	font => ($widget->{tooltip_font} || $::FONT_PROP),	2729	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2629		2737
2630	($w + 4, $h + 4)	2738	($w + 4, $h + 4)
2631	}	2739	}
2632		2740
2633	sub size_allocate {	2741	sub size_allocate {
2634	my ($self, $w, $h, $changed) = @_;	2742	my ($self, $w, $h) = @_;
2635		2743
2636	return unless $changed;
2637
2638	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2744	$self->SUPER::size_allocate ($w - 4, $h - 4);
2639	}	2745	}
2640		2746
2641	sub visibility_change {	2747	sub visibility_change {
2642	my ($self, $visible) = @_;	2748	my ($self, $visible) = @_;
2643		2749
2644	return unless $visible;	2750	return unless $visible;
2645		2751
2646	$self->{root}->on_post_alloc ("move_$self" => sub {	2752	$self->{root}->on_post_alloc ("move_$self" => sub {
2647	my $widget = $self->{owner};	2753	my $widget = $self->{owner}
		2754	or return;
2648		2755
2649	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2756	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650		2757
2651	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2758	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652	if $x + $self->{w} > $::WIDTH;	2759	if $x + $self->{w} > $::WIDTH;
2653		2760
2654	$self->move ($x, $y);	2761	$self->move_abs ($x, $y);
2655	});	2762	});
2656	}	2763	}
2657		2764
2658	sub _draw {	2765	sub _draw {
2659	my ($self) = @_;	2766	my ($self) = @_;
…		…
2763	$self->SUPER::DESTROY;	2870	$self->SUPER::DESTROY;
2764	}	2871	}
2765		2872
2766	#############################################################################	2873	#############################################################################
2767		2874
2768	package CFClient::UI::Inventory;	2875	package CFClient::UI::Buttonbar;
2769		2876
2770	our @ISA = CFClient::UI::ScrolledWindow::;	2877	our @ISA = CFClient::UI::HBox::;
2771		2878
2772	sub new {	2879	# TODO: should actualyl wrap buttons and other goodies.
2773	my $class = shift;
2774
2775	my $self = $class->SUPER::new (
2776	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2777	@_,
2778	);
2779
2780	$self
2781	}
2782
2783	sub set_items {
2784	my ($self, $items) = @_;
2785
2786	$self->{scrolled}->clear;
2787	return unless $items;
2788
2789	my @items = sort {
2790	($a->{type} <=> $b->{type})
2791	or ($a->{name} cmp $b->{name})
2792	} @$items;
2793
2794	$self->{real_items} = \@items;
2795
2796	my $row = 0;
2797	for my $item (@items) {
2798	CFClient::Item::update_widgets $item;
2799
2800	$self->{scrolled}->add (0, $row, $item->{face_widget});
2801	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2802	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2803
2804	$row++;
2805	}
2806	}
2807		2880
2808	#############################################################################	2881	#############################################################################
2809		2882
2810	package CFClient::UI::Menu;	2883	package CFClient::UI::Menu;
2811		2884
…		…
2852	# maybe save $GRAB? must be careful about events...	2925	# maybe save $GRAB? must be careful about events...
2853	$GRAB = $self;	2926	$GRAB = $self;
2854	$self->{button} = $ev->{button};	2927	$self->{button} = $ev->{button};
2855		2928
2856	$self->show;	2929	$self->show;
2857	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2930	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2858	}	2931	}
2859		2932
2860	sub mouse_motion {	2933	sub mouse_motion {
2861	my ($self, $ev, $x, $y) = @_;	2934	my ($self, $ev, $x, $y) = @_;
2862		2935
2863	# TODO: should use vbox->find_widget or so	2936	# TODO: should use vbox->find_widget or so
2864	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2937	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2865	$self->{hover} = $self->{item}{$HOVER};	2938	$self->{hover} = $self->{item}{$HOVER};
		2939
		2940	0
2866	}	2941	}
2867		2942
2868	sub button_up {	2943	sub button_up {
2869	my ($self, $ev, $x, $y) = @_;	2944	my ($self, $ev, $x, $y) = @_;
2870		2945
…		…
2872	undef $GRAB;	2947	undef $GRAB;
2873	$self->hide;	2948	$self->hide;
2874		2949
2875	$self->_emit ("popdown");	2950	$self->_emit ("popdown");
2876	$self->{hover}[1]->() if $self->{hover};	2951	$self->{hover}[1]->() if $self->{hover};
		2952	} else {
		2953	return 0
		2954	}
		2955
		2956	1
		2957	}
		2958
		2959	#############################################################################
		2960
		2961	package CFClient::UI::Multiplexer;
		2962
		2963	our @ISA = CFClient::UI::Container::;
		2964
		2965	sub new {
		2966	my $class = shift;
		2967
		2968	my $self = $class->SUPER::new (
		2969	@_,
		2970	);
		2971
		2972	$self->{current} = $self->{children}[0]
		2973	if @{ $self->{children} };
		2974
		2975	$self
		2976	}
		2977
		2978	sub add {
		2979	my ($self, @widgets) = @_;
		2980
		2981	$self->SUPER::add (@widgets);
		2982
		2983	$self->{current} = $self->{children}[0]
		2984	if @{ $self->{children} };
		2985	}
		2986
		2987	sub set_current_page {
		2988	my ($self, $page_or_widget) = @_;
		2989
		2990	my $widget = ref $page_or_widget
		2991	? $page_or_widget
		2992	: $self->{children}[$page_or_widget];
		2993
		2994	$self->{current} = $widget;
		2995	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2996
		2997	$self->_emit (page_changed => $self->{current});
		2998
		2999	$self->realloc;
		3000	}
		3001
		3002	sub visible_children {
		3003	$_[0]{current}
		3004	}
		3005
		3006	sub size_request {
		3007	my ($self) = @_;
		3008
		3009	$self->{current}->size_request
		3010	}
		3011
		3012	sub size_allocate {
		3013	my ($self, $w, $h) = @_;
		3014
		3015	$self->{current}->configure (0, 0, $w, $h);
		3016	}
		3017
		3018	sub _draw {
		3019	my ($self) = @_;
		3020
		3021	$self->{current}->draw;
		3022	}
		3023
		3024	#############################################################################
		3025
		3026	package CFClient::UI::Notebook;
		3027
		3028	our @ISA = CFClient::UI::VBox::;
		3029
		3030	sub new {
		3031	my $class = shift;
		3032
		3033	my $self = $class->SUPER::new (
		3034	buttonbar => (new CFClient::UI::Buttonbar),
		3035	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3036	# filter => # will be put between multiplexer and $self
		3037	@_,
		3038	);
2877	}	3039
		3040	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3041	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3042
		3043	$self
		3044	}
		3045
		3046	sub add {
		3047	my ($self, $title, $widget, $tooltip) = @_;
		3048
		3049	Scalar::Util::weaken $self;
		3050
		3051	$self->{buttonbar}->add (new CFClient::UI::Button
		3052	markup => $title,
		3053	tooltip => $tooltip,
		3054	on_activate => sub { $self->set_current_page ($widget) },
		3055	);
		3056
		3057	$self->{multiplexer}->add ($widget);
		3058	}
		3059
		3060	sub set_current_page {
		3061	my ($self, $page) = @_;
		3062
		3063	$self->{multiplexer}->set_current_page ($page);
		3064	$self->_emit (page_changed => $self->{multiplexer}{current});
2878	}	3065	}
2879		3066
2880	#############################################################################	3067	#############################################################################
2881		3068
2882	package CFClient::UI::Statusbox;	3069	package CFClient::UI::Statusbox;
…		…
2987	$self->SUPER::reconfigure;	3174	$self->SUPER::reconfigure;
2988	}	3175	}
2989		3176
2990	#############################################################################	3177	#############################################################################
2991		3178
		3179	package CFClient::UI::Inventory;
		3180
		3181	our @ISA = CFClient::UI::ScrolledWindow::;
		3182
		3183	sub new {
		3184	my $class = shift;
		3185
		3186	my $self = $class->SUPER::new (
		3187	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3188	@_,
		3189	);
		3190
		3191	$self
		3192	}
		3193
		3194	sub set_items {
		3195	my ($self, $items) = @_;
		3196
		3197	$self->{child}->clear;
		3198	return unless $items;
		3199
		3200	my @items = sort {
		3201	($a->{type} <=> $b->{type})
		3202	or ($a->{name} cmp $b->{name})
		3203	} @$items;
		3204
		3205	$self->{real_items} = \@items;
		3206
		3207	my $row = 0;
		3208	for my $item (@items) {
		3209	CFClient::Item::update_widgets $item;
		3210
		3211	$self->{child}->add (0, $row, $item->{face_widget});
		3212	$self->{child}->add (1, $row, $item->{desc_widget});
		3213	$self->{child}->add (2, $row, $item->{weight_widget});
		3214
		3215	$row++;
		3216	}
		3217	}
		3218
		3219	#############################################################################
		3220
		3221	package CFClient::UI::BindEditor;
		3222
		3223	our @ISA = CFClient::UI::FancyFrame::;
		3224
		3225	sub new {
		3226	my $class = shift;
		3227
		3228	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3229
		3230	$self->add (my $vb = new CFClient::UI::VBox);
		3231
		3232
		3233	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3234	text => "start recording",
		3235	tooltip => "Start/Stops recording of actions."
		3236	."All subsequent actions after the recording started will be captured."
		3237	."The actions are displayed after the record was stopped."
		3238	."To bind the action you have to click on the 'Bind' button",
		3239	on_activate => sub {
		3240	unless ($self->{recording}) {
		3241	$self->start;
		3242	} else {
		3243	$self->stop;
		3244	}
		3245	});
		3246
		3247	$vb->add (new CFClient::UI::Label text => "Actions:");
		3248	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3249
		3250	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3251	$vb->add (my $hb = new CFClient::UI::HBox);
		3252	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3253	$hb->add (new CFClient::UI::Button
		3254	text => "bind",
		3255	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3256	on_activate => sub {
		3257	$self->ask_for_bind;
		3258	});
		3259
		3260	$vb->add (my $hb = new CFClient::UI::HBox);
		3261	$hb->add (new CFClient::UI::Button
		3262	text => "ok",
		3263	expand => 1,
		3264	tooltip => "This closes the binding editor and saves the binding",
		3265	on_activate => sub {
		3266	$self->hide;
		3267	$self->commit;
		3268	});
		3269
		3270	$hb->add (new CFClient::UI::Button
		3271	text => "cancel",
		3272	expand => 1,
		3273	tooltip => "This closes the binding editor without saving",
		3274	on_activate => sub {
		3275	$self->hide;
		3276	$self->{binding_cancel}->()
		3277	if $self->{binding_cancel};
		3278	});
		3279
		3280	$self->update_binding_widgets;
		3281
		3282	$self
		3283	}
		3284
		3285	sub commit {
		3286	my ($self) = @_;
		3287	my ($mod, $sym, $cmds) = $self->get_binding;
		3288	if ($sym != 0 && @$cmds > 0) {
		3289	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3290	."'. Don't forget 'Save Config'!");
		3291	$self->{binding_change}->($mod, $sym, $cmds)
		3292	if $self->{binding_change};
		3293	} else {
		3294	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3295	$self->{binding_cancel}->()
		3296	if $self->{binding_cancel};
		3297	}
		3298	}
		3299
		3300	sub start {
		3301	my ($self) = @_;
		3302
		3303	$self->{rec_btn}->set_text ("stop recording");
		3304	$self->{recording} = 1;
		3305	$self->clear_command_list;
		3306	$::CONN->start_record if $::CONN;
		3307	}
		3308
		3309	sub stop {
		3310	my ($self) = @_;
		3311
		3312	$self->{rec_btn}->set_text ("start recording");
		3313	$self->{recording} = 0;
		3314
		3315	my $rec;
		3316	$rec = $::CONN->stop_record if $::CONN;
		3317	return unless ref $rec eq 'ARRAY';
		3318	$self->set_command_list ($rec);
		3319	}
		3320
		3321
		3322	sub ask_for_bind_and_commit {
		3323	my ($self) = @_;
		3324	$self->ask_for_bind (1);
		3325	}
		3326
		3327	sub ask_for_bind {
		3328	my ($self, $commit) = @_;
		3329
		3330	CFClient::Binder::open_binding_dialog (sub {
		3331	my ($mod, $sym) = @_;
		3332	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3333	$self->update_binding_widgets;
		3334	$self->commit if $commit;
		3335	});
		3336	}
		3337
		3338	# $mod and $sym are the modifiers and key symbol
		3339	# $cmds is a array ref of strings (the commands)
		3340	# $cb is the callback that is executed on OK
		3341	# $ccb is the callback that is executed on CANCEL and
		3342	# when the binding was unsuccessful on OK
		3343	sub set_binding {
		3344	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3345
		3346	$self->clear_command_list;
		3347	$self->{recording} = 0;
		3348	$self->{rec_btn}->set_text ("start recording");
		3349
		3350	$self->{binding} = [$mod, $sym];
		3351	$self->{commands} = $cmds;
		3352
		3353	$self->{binding_change} = $cb;
		3354	$self->{binding_cancel} = $ccb;
		3355
		3356	$self->update_binding_widgets;
		3357	}
		3358
		3359	# this is a shortcut method that asks for a binding
		3360	# and then just binds it.
		3361	sub do_quick_binding {
		3362	my ($self, $cmds) = @_;
		3363	$self->set_binding (undef, undef, $cmds, sub {
		3364	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3365	});
		3366	$self->ask_for_bind (1);
		3367	}
		3368
		3369	sub update_binding_widgets {
		3370	my ($self) = @_;
		3371	my ($mod, $sym, $cmds) = $self->get_binding;
		3372	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3373	$self->set_command_list ($cmds);
		3374	}
		3375
		3376	sub get_binding {
		3377	my ($self) = @_;
		3378	return (
		3379	$self->{binding}->[0],
		3380	$self->{binding}->[1],
		3381	[ grep { defined $_ } @{$self->{commands}} ]
		3382	);
		3383	}
		3384
		3385	sub clear_command_list {
		3386	my ($self) = @_;
		3387	$self->{cmdbox}->clear ();
		3388	}
		3389
		3390	sub set_command_list {
		3391	my ($self, $cmds) = @_;
		3392
		3393	$self->{cmdbox}->clear ();
		3394	$self->{commands} = $cmds;
		3395
		3396	my $idx = 0;
		3397
		3398	for (@$cmds) {
		3399	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3400
		3401	my $i = $idx;
		3402	$hb->add (new CFClient::UI::Label text => $_);
		3403	$hb->add (new CFClient::UI::Button
		3404	text => "delete",
		3405	tooltip => "Deletes the action from the record",
		3406	on_activate => sub {
		3407	$self->{cmdbox}->remove ($hb);
		3408	$cmds->[$i] = undef;
		3409	});
		3410
		3411
		3412	$idx++
		3413	}
		3414	}
		3415
		3416	#############################################################################
		3417
		3418	package CFClient::UI::SpellList;
		3419
		3420	our @ISA = CFClient::UI::Table::;
		3421
		3422	sub new {
		3423	my $class = shift;
		3424
		3425	my $self = $class->SUPER::new (
		3426	binding => [],
		3427	commands => [],
		3428	@_,
		3429	)
		3430	}
		3431
		3432	# XXX: Do sorting? Argl...
		3433	sub add_spell {
		3434	my ($self, $spell) = @_;
		3435	$self->{spells}->{$spell->{name}} = $spell;
		3436
		3437	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3438	face => $spell->{face},
		3439	can_hover => 1,
		3440	can_events => 1,
		3441	tooltip => $spell->{message});
		3442
		3443	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3444	text => $spell->{name},
		3445	can_hover => 1,
		3446	can_events => 1,
		3447	tooltip => $spell->{message},
		3448	expand => 1);
		3449
		3450	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3451	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3452	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3453	expand => 1);
		3454
		3455	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3456	text => "bind to key",
		3457	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3458	}
		3459
		3460	sub rebuild_spell_list {
		3461	my ($self) = @_;
		3462	$self->{tbl_idx} = 0;
		3463	$self->add_spell ($_) for values %{$self->{spells}};
		3464	}
		3465
		3466	sub remove_spell {
		3467	my ($self, $spell) = @_;
		3468	delete $self->{spells}->{$spell->{name}};
		3469	$self->rebuild_spell_list;
		3470	}
		3471
		3472	#############################################################################
		3473
2992	package CFClient::UI::Root;	3474	package CFClient::UI::Root;
2993		3475
2994	our @ISA = CFClient::UI::Container::;	3476	our @ISA = CFClient::UI::Container::;
2995		3477
2996	use CFClient::OpenGL;	3478	use CFClient::OpenGL;
…		…
3006	Scalar::Util::weaken ($self->{root} = $self);	3488	Scalar::Util::weaken ($self->{root} = $self);
3007		3489
3008	$self	3490	$self
3009	}	3491	}
3010		3492
3011	sub configure {
3012	my ($self, $x, $y, $w, $h) = @_;
3013
3014	$self->{w} = $w;
3015	$self->{h} = $h;
3016	}
3017
3018	sub reconfigure {
3019	my ($self) = @_;
3020
3021	$self->SUPER::reconfigure;
3022
3023	$self->size_allocate ($self->{w}, $self->{h}, 1)
3024	if $self->{w};
3025	}
3026
3027	sub size_request {	3493	sub size_request {
3028	my ($self) = @_;	3494	my ($self) = @_;
3029		3495
3030	($self->{w}, $self->{h})	3496	($self->{w}, $self->{h})
3031	}	3497	}
3032		3498
		3499	sub _to_pixel {
		3500	my ($coord, $size, $max) = @_;
		3501
		3502	$coord =
		3503	$coord eq "center" ? ($max - $size) * 0.5
		3504	: $coord eq "max" ? $max
		3505	: $coord;
		3506
		3507	$coord = 0 if $coord < 0;
		3508	$coord = $max - $size if $coord > $max - $size;
		3509
		3510	int $coord + 0.5
		3511	}
		3512
3033	sub size_allocate {	3513	sub size_allocate {
3034	my ($self, $w, $h, $changed) = @_;	3514	my ($self, $w, $h) = @_;
3035		3515
3036	for my $child ($self->children) {	3516	for my $child ($self->children) {
3037	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3517	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038		3518
3039	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3519	$X = $child->{force_x} if exists $child->{force_x};
3040	if exists $child->{req_x};	3520	$Y = $child->{force_y} if exists $child->{force_y};
3041		3521
3042	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3522	$X = _to_pixel $X, $W, $self->{w};
3043	if exists $child->{req_y};	3523	$Y = _to_pixel $Y, $H, $self->{h};
3044
3045	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046
3047	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3048	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3049		3524
3050	$child->configure ($X, $Y, $W, $H);	3525	$child->configure ($X, $Y, $W, $H);
3051	}	3526	}
3052	}	3527	}
3053		3528
…		…
3070	}	3545	}
3071		3546
3072	sub add {	3547	sub add {
3073	my ($self, @children) = @_;	3548	my ($self, @children) = @_;
3074		3549
3075	for my $child (@children) {
3076	$child->{is_toplevel} = 1;	3550	$_->{is_toplevel} = 1
3077		3551	for @children;
3078	# integerise window positions
3079	$child->{x} = int $child->{x};
3080	$child->{y} = int $child->{y};
3081	}
3082		3552
3083	$self->SUPER::add (@children);	3553	$self->SUPER::add (@children);
3084	}	3554	}
3085		3555
3086	sub remove {	3556	sub remove {
3087	my ($self, @children) = @_;	3557	my ($self, @children) = @_;
3088		3558
3089	$self->SUPER::remove (@children);	3559	$self->SUPER::remove (@children);
		3560
		3561	delete $self->{is_toplevel}
		3562	for @children;
3090		3563
3091	while (@children) {	3564	while (@children) {
3092	my $w = pop @children;	3565	my $w = pop @children;
3093	push @children, $w->children;	3566	push @children, $w->children;
3094	$w->set_invisible;	3567	$w->set_invisible;
…		…
3114	$_->()	3587	$_->()
3115	for values %{delete $self->{refresh_hook}};	3588	for values %{delete $self->{refresh_hook}};
3116	}	3589	}
3117		3590
3118	if ($self->{realloc}) {	3591	if ($self->{realloc}) {
		3592	my %queue;
3119	my @queue;	3593	my @queue;
		3594	my $widget;
3120		3595
		3596	outer:
3121	while () {	3597	while () {
3122	if ($self->{realloc}) {	3598	if (my $realloc = delete $self->{realloc}) {
3123	#TODO use array-of-depth approach	3599	for $widget (values %$realloc) {
		3600	$widget->{visible} or next; # do not resize invisible widgets
3124		3601
3125	@queue = sort { $a->{visible} <=> $b->{visible} }	3602	$queue{$widget+0}++ and next; # duplicates are common
3126	@queue, values %{delete $self->{realloc}};	3603
		3604	push @{ $queue[$widget->{visible}] }, $widget;
		3605	}
3127	}	3606	}
3128		3607
		3608	while () {
		3609	@queue or last outer;
		3610
		3611	$widget = pop @{ $queue[-1] || [] }
		3612	and last;
		3613
		3614	pop @queue;
		3615	}
		3616
		3617	delete $queue{$widget+0};
		3618
		3619	my ($w, $h) = $widget->size_request;
		3620
		3621	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3622	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3623
		3624	$w = $widget->{force_w} if exists $widget->{force_w};
		3625	$h = $widget->{force_h} if exists $widget->{force_h};
		3626
		3627	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3628	|| delete $widget->{force_realloc}) {
		3629	$widget->{req_w} = $w;
		3630	$widget->{req_h} = $h;
		3631
		3632	$self->{size_alloc}{$widget+0} = $widget;
		3633
		3634	if (my $parent = $widget->{parent}) {
		3635	$self->{realloc}{$parent+0} = $parent
		3636	unless $queue{$parent+0};
		3637
		3638	$parent->{force_size_alloc} = 1;
		3639	$self->{size_alloc}{$parent+0} = $parent;
		3640	}
		3641	}
		3642
		3643	delete $self->{realloc}{$widget+0};
		3644	}
		3645	}
		3646
		3647	while (my $size_alloc = delete $self->{size_alloc}) {
		3648	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3649	values %$size_alloc;
		3650
		3651	while () {
3129	my $widget = pop @queue || last;	3652	my $widget = pop @queue || last;
3130		3653
3131	$widget->{visible} or last; # do not resize invisible widgets	3654	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3132
3133	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3134	? @$widget{qw(def_w def_h)}
3135	: $widget->size_request;
3136
3137	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3138
3139	$widget->{req_w} = $w;
3140	$widget->{req_h} = $h;
3141
3142	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3143
3144	push @queue, $widget->{parent}
3145	if $widget->{parent};
3146	}
3147	}
3148
3149	while (my $size_alloc = delete $self->{size_alloc}) {
3150	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3151	values %$size_alloc;
3152
3153	while () {
3154	my ($widget, $w, $h) = @{ pop @queue or last };
3155		3655
3156	$w = 0 if $w < 0;	3656	$w = 0 if $w < 0;
3157	$h = 0 if $h < 0;	3657	$h = 0 if $h < 0;
3158		3658
3159	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3659	$w = int $w + 0.5;
		3660	$h = int $h + 0.5;
3160		3661
		3662	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3663	$widget->{old_w} = $widget->{w};
		3664	$widget->{old_h} = $widget->{h};
		3665
3161	$widget->{w} = $w;	3666	$widget->{w} = $w;
3162	$widget->{h} = $h;	3667	$widget->{h} = $h;
3163		3668
3164	$widget->emit (size_allocate => $w, $h, $changed);	3669	$widget->emit (size_allocate => $w, $h);
		3670	}
3165	}	3671	}
3166	}	3672	}
3167		3673
3168	while ($self->{post_alloc_hook}) {	3674	while ($self->{post_alloc_hook}) {
3169	$_->()	3675	$_->()
3170	for values %{delete $self->{post_alloc_hook}};	3676	for values %{delete $self->{post_alloc_hook}};
3171	}	3677	}
		3678
3172		3679
3173	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3680	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3174	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3681	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3175	glClear GL_COLOR_BUFFER_BIT;	3682	glClear GL_COLOR_BUFFER_BIT;
3176		3683
…		…
3178	glLoadIdentity;	3685	glLoadIdentity;
3179	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3686	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3180	glMatrixMode GL_MODELVIEW;	3687	glMatrixMode GL_MODELVIEW;
3181	glLoadIdentity;	3688	glLoadIdentity;
3182		3689
		3690	{
		3691	package CFClient::UI::Base;
		3692
		3693	($draw_x, $draw_y, $draw_w, $draw_h) =
		3694	(0, 0, $self->{w}, $self->{h});
		3695	}
		3696
3183	$self->_draw;	3697	$self->_draw;
3184	}	3698	}
3185		3699
3186	#############################################################################	3700	#############################################################################
3187		3701

Diff Legend

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