ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.252 by root, Sun May 28 23:21:28 2006 UTC vs.
Revision 1.275 by root, Sat Jun 3 22:50:48 2006 UTC

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

Diff Legend

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