ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.254 by root, Mon May 29 01:53:23 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 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
370	delete $self->{max_w}; $self->{max_w} = $w if $w;	386	$self->{max_w} = int $w if defined $w;
371	delete $self->{max_h}; $self->{max_h} = $h if $h;	387	$self->{max_h} = int $h if defined $h;
		388
		389	$self->realloc;
372	}	390	}
373		391
374	sub set_tooltip {	392	sub set_tooltip {
375	my ($self, $tooltip) = @_;	393	my ($self, $tooltip) = @_;
376		394
…		…
428		446
429	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	447	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
430	unless $FOCUS;	448	unless $FOCUS;
431	}	449	}
432		450
433	sub mouse_motion { }	451	sub mouse_motion { 0 }
434	sub button_up { }	452	sub button_up { 0 }
435	sub key_down { }	453	sub key_down { 0 }
436	sub key_up { }	454	sub key_up { 0 }
437		455
438	sub button_down {	456	sub button_down {
439	my ($self, $ev, $x, $y) = @_;	457	my ($self, $ev, $x, $y) = @_;
440		458
441	$self->focus_in;	459	$self->focus_in;
442	}
443		460
444	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	461	0
445	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	462	}
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		463
450	sub find_widget {	464	sub find_widget {
451	my ($self, $x, $y) = @_;	465	my ($self, $x, $y) = @_;
452		466
453	return () unless $self->{can_events};	467	return () unless $self->{can_events};
…		…
461		475
462	sub set_parent {	476	sub set_parent {
463	my ($self, $parent) = @_;	477	my ($self, $parent) = @_;
464		478
465	Scalar::Util::weaken ($self->{parent} = $parent);	479	Scalar::Util::weaken ($self->{parent} = $parent);
466
467	$self->set_visible if $parent->{visible};	480	$self->set_visible if $parent->{visible};
468	}	481	}
469		482
470	sub connect {	483	sub connect {
471	my ($self, $signal, $cb) = @_;	484	my ($self, $signal, $cb) = @_;
…		…
492		505
493	sub realloc {	506	sub realloc {
494	my ($self) = @_;	507	my ($self) = @_;
495		508
496	if ($self->{visible}) {	509	if ($self->{visible}) {
497	return if $self->{root}{realloc}{$self};	510	return if $self->{root}{realloc}{$self+0};
498		511
499	$self->{root}{realloc}{$self} = $self;	512	$self->{root}{realloc}{$self+0} = $self;
500	$self->{root}->update;	513	$self->{root}->update;
501	} else {	514	} else {
502	delete $self->{req_w};	515	delete $self->{req_w};
		516	delete $self->{req_h};
503	}	517	}
504	}	518	}
505		519
506	sub update {	520	sub update {
507	my ($self) = @_;	521	my ($self) = @_;
508		522
509	$self->{parent}->update	523	$self->{parent}->update
510	if $self->{parent};	524	if $self->{parent};
511	}	525	}
512		526
		527	sub reconfigure {
		528	my ($self) = @_;
		529
		530	$self->realloc;
		531	$self->update;
		532	}
		533
		534	# using global variables seems a bit hacky, but passing through all drawing
		535	# functions seems pointless.
		536	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		537
513	sub draw {	538	sub draw {
514	my ($self) = @_;	539	my ($self) = @_;
515		540
516	return unless $self->{h} && $self->{w};	541	return unless $self->{h} && $self->{w};
		542
		543	# update screen rectangle
		544	local $draw_x = $draw_x + $self->{x};
		545	local $draw_y = $draw_y + $self->{y};
		546	local $draw_w = $draw_x + $self->{w};
		547	local $draw_h = $draw_y + $self->{h};
		548
		549	# skip widgets that are entirely outside the drawing area
		550	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		551	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
517		552
518	glPushMatrix;	553	glPushMatrix;
519	glTranslate $self->{x}, $self->{y}, 0;	554	glTranslate $self->{x}, $self->{y}, 0;
520	$self->_draw;
521	glPopMatrix;
522		555
523	if ($self == $HOVER && $self->{can_hover}) {	556	if ($self == $HOVER && $self->{can_hover}) {
524	my ($x, $y) = @$self{qw(x y)};
525
526	glColor 1, 0.8, 0.5, 0.2;	557	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
527	glEnable GL_BLEND;	558	glEnable GL_BLEND;
528	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	559	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
529	glBegin GL_QUADS;	560	glBegin GL_QUADS;
530	glVertex $x , $y;	561	glVertex 0 , 0;
531	glVertex $x + $self->{w}, $y;	562	glVertex $self->{w}, 0;
532	glVertex $x + $self->{w}, $y + $self->{h};	563	glVertex $self->{w}, $self->{h};
533	glVertex $x , $y + $self->{h};	564	glVertex 0 , $self->{h};
534	glEnd;	565	glEnd;
535	glDisable GL_BLEND;	566	glDisable GL_BLEND;
536	}	567	}
537		568
538	if ($ENV{PCLIENT_DEBUG}) {	569	if ($ENV{CFPLUS_DEBUG} & 1) {
539	glPushMatrix;	570	glPushMatrix;
540	glColor 1, 1, 0, 1;	571	glColor 1, 1, 0, 1;
541	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	572	glTranslate 0.375, 0.375;
542	glBegin GL_LINE_LOOP;	573	glBegin GL_LINE_LOOP;
543	glVertex 0 , 0;	574	glVertex 0 , 0;
544	glVertex $self->{w} - 1, 0;	575	glVertex $self->{w} - 1, 0;
545	glVertex $self->{w} - 1, $self->{h} - 1;	576	glVertex $self->{w} - 1, $self->{h} - 1;
546	glVertex 0 , $self->{h} - 1;	577	glVertex 0 , $self->{h} - 1;
547	glEnd;	578	glEnd;
548	glPopMatrix;	579	glPopMatrix;
549	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	580	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
550	}	581	}
		582
		583	$self->_draw;
		584	glPopMatrix;
551	}	585	}
552		586
553	sub _draw {	587	sub _draw {
554	my ($self) = @_;	588	my ($self) = @_;
555		589
…		…
593		627
594	if ($color && (@$color < 4 || $color->[3])) {	628	if ($color && (@$color < 4 || $color->[3])) {
595	my ($w, $h) = @$self{qw(w h)};	629	my ($w, $h) = @$self{qw(w h)};
596		630
597	glEnable GL_BLEND;	631	glEnable GL_BLEND;
598	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	632	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
599	glColor @$color;	633	glColor_premultiply @$color;
600		634
601	glBegin GL_QUADS;	635	glBegin GL_QUADS;
602	glVertex 0 , 0;	636	glVertex 0 , 0;
603	glVertex 0 , $h;	637	glVertex 0 , $h;
604	glVertex $w, $h;	638	glVertex $w, $h;
…		…
619	my ($class, %arg) = @_;	653	my ($class, %arg) = @_;
620	$class->SUPER::new (can_events => 0, %arg);	654	$class->SUPER::new (can_events => 0, %arg);
621	}	655	}
622		656
623	sub size_request {	657	sub size_request {
624	(0, 0)	658	my ($self) = @_;
		659
		660	($self->{w} + 0, $self->{h} + 0)
625	}	661	}
626		662
627	sub draw { }	663	sub draw { }
628		664
629	#############################################################################	665	#############################################################################
…		…
633	our @ISA = CFClient::UI::Base::;	669	our @ISA = CFClient::UI::Base::;
634		670
635	sub new {	671	sub new {
636	my ($class, %arg) = @_;	672	my ($class, %arg) = @_;
637		673
638	my $children = delete $arg{children} || [];	674	my $children = delete $arg{children};
639		675
640	my $self = $class->SUPER::new (	676	my $self = $class->SUPER::new (
641	children => [],	677	children => [],
642	can_events => 0,	678	can_events => 0,
643	%arg,	679	%arg,
644	);	680	);
		681
645	$self->add ($_) for @$children;	682	$self->add (@$children)
		683	if $children;
646		684
647	$self	685	$self
648	}	686	}
649		687
650	sub add {	688	sub add {
…		…
698	$x -= $self->{x};	736	$x -= $self->{x};
699	$y -= $self->{y};	737	$y -= $self->{y};
700		738
701	my $res;	739	my $res;
702		740
703	for (reverse @{ $self->{children} }) {	741	for (reverse $self->visible_children) {
704	$res = $_->find_widget ($x, $y)	742	$res = $_->find_widget ($x, $y)
705	and return $res;	743	and return $res;
706	}	744	}
707		745
708	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	746	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
750	sub size_request {	788	sub size_request {
751	$_[0]{children}[0]->size_request	789	$_[0]{children}[0]->size_request
752	}	790	}
753		791
754	sub size_allocate {	792	sub size_allocate {
755	my ($self, $w, $h, $changed) = @_;	793	my ($self, $w, $h) = @_;
756		794
757	$self->{children}[0]->configure (0, 0, $w, $h);	795	$self->{children}[0]->configure (0, 0, $w, $h);
758	}	796	}
759		797
760	#############################################################################	798	#############################################################################
		799
		800	# back-buffered drawing area
761		801
762	package CFClient::UI::Window;	802	package CFClient::UI::Window;
763		803
764	our @ISA = CFClient::UI::Bin::;	804	our @ISA = CFClient::UI::Bin::;
765		805
…		…
777	$ROOT->on_post_alloc ($self => sub { $self->render_child });	817	$ROOT->on_post_alloc ($self => sub { $self->render_child });
778	$self->SUPER::update;	818	$self->SUPER::update;
779	}	819	}
780		820
781	sub size_allocate {	821	sub size_allocate {
782	my ($self, $w, $h, $changed) = @_;	822	my ($self, $w, $h) = @_;
783		823
784	$self->SUPER::size_allocate ($w, $h, $changed);	824	$self->SUPER::size_allocate ($w, $h);
785	$self->update	825	$self->update;
786	if $changed;
787	}	826	}
788		827
789	sub _render {	828	sub _render {
		829	my ($self) = @_;
		830
790	$_[0]{children}[0]->draw;	831	$self->{children}[0]->draw;
791	}	832	}
792		833
793	sub render_child {	834	sub render_child {
794	my ($self) = @_;	835	my ($self) = @_;
795		836
796	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797	glClearColor 0, 0, 0, 0;	838	glClearColor 0, 0, 0, 0;
798	glClear GL_COLOR_BUFFER_BIT;	839	glClear GL_COLOR_BUFFER_BIT;
799		840
		841	{
		842	package CFClient::UI::Base;
		843
		844	($draw_x, $draw_y, $draw_w, $draw_h) =
		845	(0, 0, $self->{w}, $self->{h});
		846	}
		847
800	$self->_render;	848	$self->_render;
801	};	849	};
802	}	850	}
803		851
804	sub _draw {	852	sub _draw {
805	my ($self) = @_;	853	my ($self) = @_;
806		854
807	my ($w, $h) = ($self->w, $self->h);	855	my ($w, $h) = @$self{qw(w h)};
808		856
809	my $tex = $self->{texture}	857	my $tex = $self->{texture}
810	or return;	858	or return;
811		859
812	glEnable GL_TEXTURE_2D;	860	glEnable GL_TEXTURE_2D;
813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814	glColor 1, 1, 1, 1;	862	glColor 0, 0, 0, 1;
815		863
816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817		865
818	glDisable GL_TEXTURE_2D;	866	glDisable GL_TEXTURE_2D;
819	}	867	}
…		…
835	}	883	}
836		884
837	sub size_request {	885	sub size_request {
838	my ($self) = @_;	886	my ($self) = @_;
839		887
840	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	888	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841		889
842	$w = 10 if $self->{scroll_x};	890	$w = 10 if $self->{scroll_x};
843	$h = 10 if $self->{scroll_y};	891	$h = 10 if $self->{scroll_y};
844		892
845	($w, $h)	893	($w, $h)
846	}	894	}
847		895
848	sub size_allocate {	896	sub size_allocate {
849	my ($self, $w, $h, $changed) = @_;	897	my ($self, $w, $h) = @_;
850		898
		899	my $child = $self->child;
		900
851	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	901	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	902	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853		903
854	$self->child->configure (0, 0, $w, $h);	904	$self->child->configure (0, 0, $w, $h);
855	$self->update;	905	$self->update;
856	}	906	}
857		907
…		…
893	}	943	}
894		944
895	sub _render {	945	sub _render {
896	my ($self) = @_;	946	my ($self) = @_;
897		947
		948	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		949	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		950
898	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899		952
900	$self->SUPER::_render;	953	$self->SUPER::_render;
901	}	954	}
902		955
…		…
905	package CFClient::UI::ScrolledWindow;	958	package CFClient::UI::ScrolledWindow;
906		959
907	our @ISA = CFClient::UI::HBox::;	960	our @ISA = CFClient::UI::HBox::;
908		961
909	sub new {	962	sub new {
910	my $class = shift;	963	my ($class, %arg) = @_;
		964
		965	my $child = delete $arg{child};
911		966
912	my $self;	967	my $self;
913		968
914	my $slider = new CFClient::UI::Slider	969	my $slider = new CFClient::UI::Slider
915	vertical => 1,	970	vertical => 1,
…		…
920	;	975	;
921		976
922	$self = $class->SUPER::new (	977	$self = $class->SUPER::new (
923	vp => (new CFClient::UI::ViewPort expand => 1),	978	vp => (new CFClient::UI::ViewPort expand => 1),
924	slider => $slider,	979	slider => $slider,
925	@_,	980	%arg,
926	);	981	);
927		982
928	$self->{vp}->add ($self->{scrolled});
929	$self->add ($self->{vp});
930	$self->add ($self->{slider});	983	$self->SUPER::add ($self->{vp}, $self->{slider});
		984	$self->add ($child) if $child;
931		985
932	$self	986	$self
		987	}
		988
		989	sub add {
		990	my ($self, $widget) = @_;
		991
		992	$self->{vp}->add ($self->{child} = $widget);
933	}	993	}
934		994
935	sub update {	995	sub update {
936	my ($self) = @_;	996	my ($self) = @_;
937		997
…		…
941	my $child = $self->{vp}->child;	1001	my $child = $self->{vp}->child;
942	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943	}	1003	}
944		1004
945	sub size_allocate {	1005	sub size_allocate {
946	my ($self, $w, $h, $changed) = @_;	1006	my ($self, $w, $h) = @_;
947		1007
948	$self->SUPER::size_allocate ($w, $h, $changed);	1008	$self->SUPER::size_allocate ($w, $h);
949		1009
950	my $child = $self->{vp}->child;	1010	my $child = $self->{vp}->child;
951	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1011	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
952	}	1012	}
953		1013
…		…
976		1036
977	if ($self->{bg}) {	1037	if ($self->{bg}) {
978	my ($w, $h) = @$self{qw(w h)};	1038	my ($w, $h) = @$self{qw(w h)};
979		1039
980	glEnable GL_BLEND;	1040	glEnable GL_BLEND;
981	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1041	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
982	glColor @{ $self->{bg} };	1042	glColor_premultiply @{ $self->{bg} };
983		1043
984	glBegin GL_QUADS;	1044	glBegin GL_QUADS;
985	glVertex 0 , 0;	1045	glVertex 0 , 0;
986	glVertex 0 , $h;	1046	glVertex 0 , $h;
987	glVertex $w, $h;	1047	glVertex $w, $h;
…		…
1000		1060
1001	our @ISA = CFClient::UI::Bin::;	1061	our @ISA = CFClient::UI::Bin::;
1002		1062
1003	use CFClient::OpenGL;	1063	use CFClient::OpenGL;
1004		1064
1005	my @tex =	1065	my $bg =
		1066	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1067	mipmap => 1, wrap => 1;
		1068
		1069	my @border =
1006	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1070	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);	1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1008		1072
1009	sub new {	1073	sub new {
1010	my $class = shift;	1074	my ($class, %arg) = @_;
		1075
		1076	my $title = delete $arg{title};
1011		1077
1012	my $self = $class->SUPER::new (	1078	my $self = $class->SUPER::new (
1013	bg => [1, 1, 1, 1],	1079	bg => [1, 1, 1, 1],
1014	border_bg => [1, 1, 1, 1],	1080	border_bg => [1, 1, 1, 1],
1015	border => 0.6,	1081	border => 0.6,
1016	is_toplevel => 1,
1017	can_events => 1,	1082	can_events => 1,
1018	@_	1083	min_w => 16,
		1084	min_h => 16,
		1085	%arg,
1019	);	1086	);
1020		1087
1021	$self->{title} &&= new CFClient::UI::Label	1088	$self->{title} = new CFClient::UI::Label
1022	align => 0,	1089	align => 0,
1023	valign => 1,	1090	valign => 1,
1024	text => $self->{title},	1091	text => $title,
1025	fontsize => $self->{border};	1092	fontsize => $self->{border}
		1093	if defined $title;
1026		1094
1027	$self	1095	$self
		1096	}
		1097
		1098	sub add {
		1099	my ($self, @widgets) = @_;
		1100
		1101	$self->SUPER::add (@widgets);
		1102	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1028	}	1103	}
1029		1104
1030	sub border {	1105	sub border {
1031	int $_[0]{border} * $::FONTSIZE	1106	int $_[0]{border} * $::FONTSIZE
1032	}	1107	}
1033		1108
1034	sub size_request {	1109	sub size_request {
1035	my ($self) = @_;	1110	my ($self) = @_;
		1111
		1112	$self->{title}->size_request
		1113	if $self->{title};
1036		1114
1037	my ($w, $h) = $self->SUPER::size_request;	1115	my ($w, $h) = $self->SUPER::size_request;
1038		1116
1039	(	1117	(
1040	$w + $self->border * 2,	1118	$w + $self->border * 2,
1041	$h + $self->border * 2,	1119	$h + $self->border * 2,
1042	)	1120	)
1043	}	1121	}
1044		1122
1045	sub size_allocate {	1123	sub size_allocate {
1046	my ($self, $w, $h, $changed) = @_;	1124	my ($self, $w, $h) = @_;
1047		1125
1048	return unless $changed;	1126	if ($self->{title}) {
		1127	$self->{title}{w} = $w;
		1128	$self->{title}{h} = $h;
		1129	$self->{title}->size_allocate ($w, $h);
		1130	}
1049		1131
		1132	my $border = $self->border;
		1133
1050	$h -= List::Util::max 0, $self->border * 2;	1134	$h -= List::Util::max 0, $border * 2;
1051	$w -= List::Util::max 0, $self->border * 2;	1135	$w -= List::Util::max 0, $border * 2;
1052		1136
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);	1137	$self->child->configure ($border, $border, $w, $h);
1057	}	1138	}
1058		1139
1059	sub button_down {	1140	sub button_down {
1060	my ($self, $ev, $x, $y) = @_;	1141	my ($self, $ev, $x, $y) = @_;
1061		1142
…		…
1077	my ($ev, $x, $y) = @_;	1158	my ($ev, $x, $y) = @_;
1078		1159
1079	my $dx = $ev->{x} - $ox;	1160	my $dx = $ev->{x} - $ox;
1080	my $dy = $ev->{y} - $oy;	1161	my $dy = $ev->{y} - $oy;
1081		1162
1082	$self->{user_x} = $wx + $dx * $mx;
1083	$self->{user_y} = $wy + $dy * $my;
1084	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1163	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1164	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086	$self->move ($self->{user_x}, $self->{user_y});	1165
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1087	$self->realloc;	1167	$self->realloc;
1088	};	1168	};
1089		1169
1090	} elsif ($lr ^ $td) {	1170	} elsif ($lr ^ $td) {
1091	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1171	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
1094	$self->{motion} = sub {	1174	$self->{motion} = sub {
1095	my ($ev, $x, $y) = @_;	1175	my ($ev, $x, $y) = @_;
1096		1176
1097	($x, $y) = ($ev->{x}, $ev->{y});	1177	($x, $y) = ($ev->{x}, $ev->{y});
1098		1178
1099	$self->{user_x} = $bx + $x - $ox;	1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1100	$self->{user_y} = $by + $y - $oy;	1180	# HACK: the next line is required to enforce placement
1101		1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1102	$self->move ($self->{user_x}, $self->{user_y});
1103	$self->realloc;
1104	};	1182	};
		1183	} else {
		1184	return 0;
		1185	}
		1186
1105	}	1187	1
1106	}	1188	}
1107		1189
1108	sub button_up {	1190	sub button_up {
1109	my ($self, $ev, $x, $y) = @_;	1191	my ($self, $ev, $x, $y) = @_;
1110		1192
1111	delete $self->{motion};	1193	!!delete $self->{motion}
1112	}	1194	}
1113		1195
1114	sub mouse_motion {	1196	sub mouse_motion {
1115	my ($self, $ev, $x, $y) = @_;	1197	my ($self, $ev, $x, $y) = @_;
1116		1198
1117	$self->{motion}->($ev, $x, $y) if $self->{motion};	1199	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1200
		1201	!!$self->{motion}
1118	}	1202	}
1119		1203
1120	sub _draw {	1204	sub _draw {
1121	my ($self) = @_;	1205	my ($self) = @_;
1122		1206
		1207	my $child = $self->{children}[0];
		1208
1123	my ($w, $h ) = ($self->{w}, $self->{h});	1209	my ($w, $h ) = ($self->{w}, $self->{h});
1124	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1210	my ($cw, $ch) = ($child->{w}, $child->{h});
1125		1211
1126	glEnable GL_TEXTURE_2D;	1212	glEnable GL_TEXTURE_2D;
1127	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1213	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128		1214
1129	my $border = $self->border;	1215	my $border = $self->border;
1130		1216
1131	glColor @{ $self->{border_bg} };	1217	glColor @{ $self->{border_bg} };
1132	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1218	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1133	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1219	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1220	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1221	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136		1222
1137	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1223	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138	my $bg = $tex[0];	1224	glColor @{ $self->{bg} };
1139		1225
1140	# TODO: repeat texture not scale	1226	# TODO: repeat texture not scale
		1227	# solve this better(?)
1141	my $rep_x = $cw / $bg->{w};	1228	$bg->{s} = $cw / $bg->{w};
1142	my $rep_y = $ch / $bg->{h};	1229	$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);	1230	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150	}	1231	}
1151		1232
1152	glDisable GL_TEXTURE_2D;	1233	glDisable GL_TEXTURE_2D;
1153		1234
1154	$self->{title}->draw if $self->{title};
1155
1156	$self->child->draw;	1235	$child->draw;
		1236
		1237	if ($self->{title}) {
		1238	glTranslate 0, $border - $self->{h};
		1239	$self->{title}->_draw;
		1240	}
1157	}	1241	}
1158		1242
1159	#############################################################################	1243	#############################################################################
1160		1244
1161	package CFClient::UI::Table;	1245	package CFClient::UI::Table;
…		…
1235	(sum @$hs),	1319	(sum @$hs),
1236	)	1320	)
1237	}	1321	}
1238		1322
1239	sub size_allocate {	1323	sub size_allocate {
1240	my ($self, $w, $h, $changed) = @_;	1324	my ($self, $w, $h) = @_;
1241		1325
1242	my ($ws, $hs) = $self->get_wh;	1326	my ($ws, $hs) = $self->get_wh;
1243		1327
1244	my $req_w = (sum @$ws) || 1;	1328	my $req_w = (sum @$ws) || 1;
1245	my $req_h = (sum @$hs) || 1;	1329	my $req_h = (sum @$hs) || 1;
…		…
1323	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1407	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1324	)	1408	)
1325	}	1409	}
1326		1410
1327	sub size_allocate {	1411	sub size_allocate {
1328	my ($self, $w, $h, $changed) = @_;	1412	my ($self, $w, $h) = @_;
1329		1413
1330	my $space = $self->{vertical} ? $h : $w;	1414	my $space = $self->{vertical} ? $h : $w;
1331	my $children = $self->{children};	1415	my $children = $self->{children};
1332		1416
1333	my @req;	1417	my @req;
…		…
1416	ellipsise => 3, # end	1500	ellipsise => 3, # end
1417	layout => (new CFClient::Layout),	1501	layout => (new CFClient::Layout),
1418	fontsize => 1,	1502	fontsize => 1,
1419	align => -1,	1503	align => -1,
1420	valign => -1,	1504	valign => -1,
1421	padding => 2,	1505	padding_x => 2,
		1506	padding_y => 2,
1422	can_events => 0,	1507	can_events => 0,
1423	%arg	1508	%arg
1424	);	1509	);
1425		1510
1426	if (exists $self->{template}) {	1511	if (exists $self->{template}) {
…		…
1453		1538
1454	delete $self->{texture};	1539	delete $self->{texture};
1455	$self->SUPER::update;	1540	$self->SUPER::update;
1456	}	1541	}
1457		1542
		1543	sub realloc {
		1544	my ($self) = @_;
		1545
		1546	delete $self->{ox};
		1547	$self->SUPER::realloc;
		1548	}
		1549
1458	sub set_text {	1550	sub set_text {
1459	my ($self, $text) = @_;	1551	my ($self, $text) = @_;
1460		1552
1461	return if $self->{text} eq "T$text";	1553	return if $self->{text} eq "T$text";
1462	$self->{text} = "T$text";	1554	$self->{text} = "T$text";
1463		1555
1464	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1556	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1465	$self->{layout}->set_text ($text);	1557	$self->{layout}->set_text ($text);
		1558	delete $self->{req_h};
1466		1559
1467	$self->realloc;	1560	$self->realloc;
1468	$self->update;	1561	$self->update;
1469	}	1562	}
1470		1563
…		…
1476		1569
1477	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1570	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1478		1571
1479	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1572	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1480	$self->{layout}->set_markup ($markup);	1573	$self->{layout}->set_markup ($markup);
		1574	delete $self->{req_h};
1481		1575
1482	$self->realloc;	1576	$self->realloc;
1483	$self->update;	1577	$self->update;
1484	}	1578	}
1485		1579
1486	sub size_request {	1580	sub size_request {
1487	my ($self) = @_;	1581	my ($self) = @_;
1488		1582
		1583	if (exists $self->{req_h}) {
		1584	@$self{qw(req_w req_h)}
		1585	} else {
1489	$self->{layout}->set_font ($self->{font}) if $self->{font};	1586	$self->{layout}->set_font ($self->{font}) if $self->{font};
1490	$self->{layout}->set_width ($self->{max_w} || -1);	1587	$self->{layout}->set_width ($self->{max_w} || -1);
1491	$self->{layout}->set_ellipsise ($self->{ellipsise});	1588	$self->{layout}->set_ellipsise ($self->{ellipsise});
1492	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1589	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1493	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1590	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1494		1591
1495	my ($w, $h) = $self->{layout}->size;	1592	my ($w, $h) = $self->{layout}->size;
1496		1593
1497	if (exists $self->{template}) {	1594	if (exists $self->{template}) {
1498	$self->{template}->set_font ($self->{font}) if $self->{font};	1595	$self->{template}->set_font ($self->{font}) if $self->{font};
1499	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1596	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1500		1597
1501	my ($w2, $h2) = $self->{template}->size;	1598	my ($w2, $h2) = $self->{template}->size;
1502		1599
1503	$w = List::Util::max $w, $w2;	1600	$w = List::Util::max $w, $w2;
1504	$h = List::Util::max $h, $h2;	1601	$h = List::Util::max $h, $h2;
1505	}	1602	}
1506		1603
		1604	($w, $h)
1507	(	1605	}
1508	$w + $self->{padding} * 2,
1509	$h + $self->{padding} * 2,
1510	)
1511	}	1606	}
1512		1607
1513	sub size_allocate {	1608	sub size_allocate {
1514	my ($self, $w, $h, $changed) = @_;	1609	my ($self, $w, $h) = @_;
		1610
		1611	delete $self->{ox};
1515		1612
1516	delete $self->{texture}	1613	delete $self->{texture}
1517	if $changed;	1614	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1518	}	1615	}
1519		1616
1520	sub set_fontsize {	1617	sub set_fontsize {
1521	my ($self, $fontsize) = @_;	1618	my ($self, $fontsize) = @_;
1522		1619
…		…
1537	$self->{layout}->set_width ($self->{w});	1634	$self->{layout}->set_width ($self->{w});
1538	$self->{layout}->set_ellipsise ($self->{ellipsise});	1635	$self->{layout}->set_ellipsise ($self->{ellipsise});
1539	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1636	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1637	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541		1638
1542	my $tex = new_from_layout CFClient::Texture $self->{layout};	1639	new_from_layout CFClient::Texture $self->{layout}
		1640	};
1543		1641
		1642	unless (exists $self->{ox}) {
1544	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1643	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1545	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1644	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1546	: ($self->{w} - $tex->{w}) * 0.5);	1645	: ($self->{w} - $tex->{w}) * 0.5);
1547		1646
1548	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1647	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1549	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1648	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1550	: ($self->{h} - $tex->{h}) * 0.5);	1649	: ($self->{h} - $tex->{h}) * 0.5);
1551
1552	$tex
1553	};	1650	};
1554		1651
1555	glEnable GL_TEXTURE_2D;	1652	glEnable GL_TEXTURE_2D;
1556	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1653	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1557		1654
		1655	glColor_premultiply @{$self->{fg}}
1558	if ($tex->{format} == GL_ALPHA) {	1656	if $tex->{format} == GL_ALPHA;
1559	glColor @{$self->{fg}};	1657
1560	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1561	} else {
1562	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1658	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1563	}
1564		1659
1565	glDisable GL_TEXTURE_2D;	1660	glDisable GL_TEXTURE_2D;
1566	}	1661	}
1567		1662
1568	#############################################################################	1663	#############################################################################
…		…
1595		1690
1596	delete $self->{cur_h};	1691	delete $self->{cur_h};
1597		1692
1598	return if $self->{text} eq $text;	1693	return if $self->{text} eq $text;
1599		1694
1600	delete $self->{texture};
1601
1602	$self->{last_activity} = $::NOW;	1695	$self->{last_activity} = $::NOW;
1603	$self->{text} = $text;	1696	$self->{text} = $text;
1604		1697
1605	$text =~ s/./*/g if $self->{hidden};	1698	$text =~ s/./*/g if $self->{hidden};
1606	$self->{layout}->set_text ("$text ");	1699	$self->{layout}->set_text ("$text ");
		1700	delete $self->{req_h};
1607		1701
1608	$self->_emit (changed => $self->{text});	1702	$self->_emit (changed => $self->{text});
		1703
		1704	$self->realloc;
		1705	$self->update;
1609	}	1706	}
1610		1707
1611	sub set_text {	1708	sub set_text {
1612	my ($self, $text) = @_;	1709	my ($self, $text) = @_;
1613		1710
1614	$self->{cursor} = length $text;	1711	$self->{cursor} = length $text;
1615	$self->_set_text ($text);	1712	$self->_set_text ($text);
1616
1617	$self->realloc;
1618	}	1713	}
1619		1714
1620	sub get_text {	1715	sub get_text {
1621	$_[0]{text}	1716	$_[0]{text}
1622	}	1717	}
…		…
1652	$self->{cursor} = length $text;	1747	$self->{cursor} = length $text;
1653	} elsif ($uni == 27) {	1748	} elsif ($uni == 27) {
1654	$self->_emit ('escape');	1749	$self->_emit ('escape');
1655	} elsif ($uni) {	1750	} elsif ($uni) {
1656	substr $text, $self->{cursor}++, 0, chr $uni;	1751	substr $text, $self->{cursor}++, 0, chr $uni;
		1752	} else {
		1753	return 0;
1657	}	1754	}
1658		1755
1659	$self->_set_text ($text);	1756	$self->_set_text ($text);
1660		1757
1661	$self->realloc;	1758	$self->realloc;
		1759
		1760	1
1662	}	1761	}
1663		1762
1664	sub focus_in {	1763	sub focus_in {
1665	my ($self) = @_;	1764	my ($self) = @_;
1666		1765
…		…
1681	utf8::encode $text;	1780	utf8::encode $text;
1682	$self->{cursor} = length substr $text, 0, $idx;	1781	$self->{cursor} = length substr $text, 0, $idx;
1683		1782
1684	$self->_set_text ($self->{text});	1783	$self->_set_text ($self->{text});
1685	$self->update;	1784	$self->update;
		1785
		1786	1
1686	}	1787	}
1687		1788
1688	sub mouse_motion {	1789	sub mouse_motion {
1689	my ($self, $ev, $x, $y) = @_;	1790	my ($self, $ev, $x, $y) = @_;
1690	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1791	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1792
		1793	0
1691	}	1794	}
1692		1795
1693	sub _draw {	1796	sub _draw {
1694	my ($self) = @_;	1797	my ($self) = @_;
1695		1798
1696	local $self->{fg} = $self->{fg};	1799	local $self->{fg} = $self->{fg};
1697		1800
1698	if ($FOCUS == $self) {	1801	if ($FOCUS == $self) {
1699	glColor @{$self->{active_bg}};	1802	glColor_premultiply @{$self->{active_bg}};
1700	$self->{fg} = $self->{active_fg};	1803	$self->{fg} = $self->{active_fg};
1701	} else {	1804	} else {
1702	glColor @{$self->{bg}};	1805	glColor_premultiply @{$self->{bg}};
1703	}	1806	}
1704		1807
1705	glEnable GL_BLEND;	1808	glEnable GL_BLEND;
1706	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1809	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1707	glBegin GL_QUADS;	1810	glBegin GL_QUADS;
1708	glVertex 0 , 0;	1811	glVertex 0 , 0;
1709	glVertex 0 , $self->{h};	1812	glVertex 0 , $self->{h};
1710	glVertex $self->{w}, $self->{h};	1813	glVertex $self->{w}, $self->{h};
1711	glVertex $self->{w}, 0;	1814	glVertex $self->{w}, 0;
…		…
1772	} else {	1875	} else {
1773	$self->set_text ($self->{history_saveback});	1876	$self->set_text ($self->{history_saveback});
1774	}	1877	}
1775		1878
1776	} else {	1879	} else {
1777	$self->SUPER::key_down ($ev);	1880	return $self->SUPER::key_down ($ev)
		1881	}
		1882
1778	}	1883	1
1779
1780	}	1884	}
1781		1885
1782	#############################################################################	1886	#############################################################################
1783		1887
1784	package CFClient::UI::Button;	1888	package CFClient::UI::Button;
…		…
1793		1897
1794	sub new {	1898	sub new {
1795	my $class = shift;	1899	my $class = shift;
1796		1900
1797	$class->SUPER::new (	1901	$class->SUPER::new (
1798	padding => 4,	1902	padding_x => 4,
		1903	padding_y => 4,
1799	fg => [1, 1, 1],	1904	fg => [1, 1, 1],
1800	active_fg => [0, 0, 1],	1905	active_fg => [0, 0, 1],
1801	can_hover => 1,	1906	can_hover => 1,
1802	align => 0,	1907	align => 0,
1803	valign => 0,	1908	valign => 0,
…		…
1812	my ($self, $ev, $x, $y) = @_;	1917	my ($self, $ev, $x, $y) = @_;
1813		1918
1814	$self->emit ("activate")	1919	$self->emit ("activate")
1815	if $x >= 0 && $x < $self->{w}	1920	if $x >= 0 && $x < $self->{w}
1816	&& $y >= 0 && $y < $self->{h};	1921	&& $y >= 0 && $y < $self->{h};
		1922
		1923	1
1817	}	1924	}
1818		1925
1819	sub _draw {	1926	sub _draw {
1820	my ($self) = @_;	1927	my ($self) = @_;
1821		1928
1822	local $self->{fg} = $self->{fg};	1929	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1823
1824	if ($GRAB == $self) {
1825	$self->{fg} = $self->{active_fg};
1826	}
1827		1930
1828	glEnable GL_TEXTURE_2D;	1931	glEnable GL_TEXTURE_2D;
1829	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1932	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1830	glColor 0, 0, 0, 1;	1933	glColor 0, 0, 0, 1;
1831		1934
…		…
1850		1953
1851	sub new {	1954	sub new {
1852	my $class = shift;	1955	my $class = shift;
1853		1956
1854	$class->SUPER::new (	1957	$class->SUPER::new (
1855	padding => 2,	1958	padding_x => 2,
		1959	padding_y => 2,
1856	fg => [1, 1, 1],	1960	fg => [1, 1, 1],
1857	active_fg => [1, 1, 0],	1961	active_fg => [1, 1, 0],
1858	bg => [0, 0, 0, 0.2],	1962	bg => [0, 0, 0, 0.2],
1859	active_bg => [1, 1, 1, 0.5],	1963	active_bg => [1, 1, 1, 0.5],
1860	state => 0,	1964	state => 0,
…		…
1864	}	1968	}
1865		1969
1866	sub size_request {	1970	sub size_request {
1867	my ($self) = @_;	1971	my ($self) = @_;
1868		1972
1869	($self->{padding} * 2 + 6) x 2	1973	(6) x 2
1870	}	1974	}
1871		1975
1872	sub button_down {	1976	sub button_down {
1873	my ($self, $ev, $x, $y) = @_;	1977	my ($self, $ev, $x, $y) = @_;
1874		1978
1875	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1979	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1980	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877	$self->{state} = !$self->{state};	1981	$self->{state} = !$self->{state};
1878	$self->_emit (changed => $self->{state});	1982	$self->_emit (changed => $self->{state});
		1983	} else {
		1984	return 0
		1985	}
		1986
1879	}	1987	1
1880	}	1988	}
1881		1989
1882	sub _draw {	1990	sub _draw {
1883	my ($self) = @_;	1991	my ($self) = @_;
1884		1992
1885	$self->SUPER::_draw;	1993	$self->SUPER::_draw;
1886		1994
1887	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1995	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888		1996
1889	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1997	my ($w, $h) = @$self{qw(w h)};
		1998
		1999	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1890		2000
1891	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	2001	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892		2002
1893	my $tex = $self->{state} ? $tex[1] : $tex[0];	2003	my $tex = $self->{state} ? $tex[1] : $tex[0];
1894		2004
…		…
2049		2159
2050	my $h1 = $self->{h} * (1 - $ycut1);	2160	my $h1 = $self->{h} * (1 - $ycut1);
2051	my $h2 = $self->{h} * (1 - $ycut2);	2161	my $h2 = $self->{h} * (1 - $ycut2);
2052		2162
2053	glEnable GL_BLEND;	2163	glEnable GL_BLEND;
2054	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2164	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2165	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2055	glEnable GL_TEXTURE_2D;	2166	glEnable GL_TEXTURE_2D;
2056	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2167	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057		2168
2058	glBindTexture GL_TEXTURE_2D, $t1->{name};	2169	glBindTexture GL_TEXTURE_2D, $t1->{name};
2059	glBegin GL_QUADS;	2170	glBegin GL_QUADS;
…		…
2159	fg => [1, 1, 1],	2270	fg => [1, 1, 1],
2160	active_fg => [0, 0, 0],	2271	active_fg => [0, 0, 0],
2161	bg => [0, 0, 0, 0.2],	2272	bg => [0, 0, 0, 0.2],
2162	active_bg => [1, 1, 1, 0.5],	2273	active_bg => [1, 1, 1, 0.5],
2163	range => [0, 0, 100, 10, 0],	2274	range => [0, 0, 100, 10, 0],
2164	req_w => $::WIDTH / 80,	2275	min_w => $::WIDTH / 80,
2165	req_h => $::WIDTH / 80,	2276	min_h => $::WIDTH / 80,
2166	vertical => 0,	2277	vertical => 0,
2167	can_hover => 1,	2278	can_hover => 1,
2168	inner_pad => 0.02,	2279	inner_pad => 0.02,
2169	@_	2280	@_
2170	);	2281	);
…		…
2210	}	2321	}
2211		2322
2212	sub size_request {	2323	sub size_request {
2213	my ($self) = @_;	2324	my ($self) = @_;
2214		2325
2215	my $w = $self->{req_w};	2326	($self->{req_w}, $self->{req_h})
2216	my $h = $self->{req_h};
2217
2218	$self->{vertical} ? ($h, $w) : ($w, $h)
2219	}	2327	}
2220		2328
2221	sub button_down {	2329	sub button_down {
2222	my ($self, $ev, $x, $y) = @_;	2330	my ($self, $ev, $x, $y) = @_;
2223		2331
2224	$self->SUPER::button_down ($ev, $x, $y);	2332	$self->SUPER::button_down ($ev, $x, $y);
2225		2333
2226	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2334	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227		2335
2228	$self->mouse_motion ($ev, $x, $y);	2336	$self->mouse_motion ($ev, $x, $y)
2229	}	2337	}
2230		2338
2231	sub mouse_motion {	2339	sub mouse_motion {
2232	my ($self, $ev, $x, $y) = @_;	2340	my ($self, $ev, $x, $y) = @_;
2233		2341
…		…
2237	my (undef, $lo, $hi, $page) = @{$self->{range}};	2345	my (undef, $lo, $hi, $page) = @{$self->{range}};
2238		2346
2239	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2347	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240		2348
2241	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2349	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2350	} else {
		2351	return 0;
		2352	}
		2353
2242	}	2354	1
2243	}	2355	}
2244		2356
2245	sub update {	2357	sub update {
2246	my ($self) = @_;	2358	my ($self) = @_;
2247		2359
2248	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2360	delete $self->{knob_w};
		2361	$self->SUPER::update;
		2362	}
		2363
		2364	sub _draw {
		2365	my ($self) = @_;
		2366
		2367	unless ($self->{knob_w}) {
2249	$self->set_value ($self->{range}[0]);	2368	$self->set_value ($self->{range}[0]);
2250		2369
2251	my ($value, $lo, $hi, $page) = @{$self->{range}};	2370	my ($value, $lo, $hi, $page) = @{$self->{range}};
2252	my $range = ($hi - $page - $lo) || 1e-100;	2371	my $range = ($hi - $page - $lo) || 1e-100;
2253		2372
…		…
2259	$value = ($value - $lo) / $range;	2378	$value = ($value - $lo) / $range;
2260	$value = $value * $self->{scale} + $self->{offset};	2379	$value = $value * $self->{scale} + $self->{offset};
2261		2380
2262	$self->{knob_x} = $value - $knob_w * 0.5;	2381	$self->{knob_x} = $value - $knob_w * 0.5;
2263	$self->{knob_w} = $knob_w;	2382	$self->{knob_w} = $knob_w;
2264	});	2383	}
2265
2266	$self->SUPER::update;
2267	}
2268
2269	sub _draw {
2270	my ($self) = @_;
2271		2384
2272	$self->SUPER::_draw ();	2385	$self->SUPER::_draw ();
2273		2386
2274	glScale $self->{w}, $self->{h};	2387	glScale $self->{w}, $self->{h};
2275		2388
…		…
2373	$self->{fontsize} = $fontsize;	2486	$self->{fontsize} = $fontsize;
2374	$self->reflow;	2487	$self->reflow;
2375	}	2488	}
2376		2489
2377	sub size_allocate {	2490	sub size_allocate {
2378	my ($self, $w, $h, $changed) = @_;	2491	my ($self, $w, $h) = @_;
2379		2492
2380	$self->SUPER::size_allocate ($w, $h, $changed);	2493	$self->SUPER::size_allocate ($w, $h);
2381
2382	return unless $changed;
2383		2494
2384	$self->{layout}->set_font ($self->{font}) if $self->{font};	2495	$self->{layout}->set_font ($self->{font}) if $self->{font};
2385	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2496	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386	$self->{layout}->set_width ($self->{children}[0]{w});	2497	$self->{layout}->set_width ($self->{children}[0]{w});
2387		2498
…		…
2471		2582
2472	delete $self->{texture};	2583	delete $self->{texture};
2473	}	2584	}
2474		2585
2475	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2586	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2476	glClearColor 0.5, 0.5, 0.5, 0;	2587	glClearColor 0, 0, 0, 0;
2477	glClear GL_COLOR_BUFFER_BIT;	2588	glClear GL_COLOR_BUFFER_BIT;
2478		2589
2479	my $top = int $self->{children}[1]{range}[0];	2590	my $top = int $self->{children}[1]{range}[0];
2480		2591
2481	my $y0 = $top;	2592	my $y0 = $top;
…		…
2516	sub _draw {	2627	sub _draw {
2517	my ($self) = @_;	2628	my ($self) = @_;
2518		2629
2519	glEnable GL_TEXTURE_2D;	2630	glEnable GL_TEXTURE_2D;
2520	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2631	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521	glColor 1, 1, 1, 1;	2632	glColor 0, 0, 0, 1;
2522	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2633	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2523	glDisable GL_TEXTURE_2D;	2634	glDisable GL_TEXTURE_2D;
2524		2635
2525	$self->{children}[1]->draw;	2636	$self->{children}[1]->draw;
2526		2637
2527	}	2638	}
…		…
2610	}	2721	}
2611		2722
2612	sub set_tooltip_from {	2723	sub set_tooltip_from {
2613	my ($self, $widget) = @_;	2724	my ($self, $widget) = @_;
2614		2725
		2726	my $tooltip = $widget->{tooltip};
		2727
		2728	if ($ENV{CFPLUS_DEBUG} & 2) {
		2729	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2730	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2731	. "req $widget->{req_w} $widget->{req_h}\n"
		2732	. "visible $widget->{visible}";
		2733	}
		2734
2615	$self->add (new CFClient::UI::Label	2735	$self->add (new CFClient::UI::Label
2616	markup => $widget->{tooltip},	2736	markup => $tooltip,
2617	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2737	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618	fontsize => 0.8,	2738	fontsize => 0.8,
2619	fg => [0, 0, 0, 1],	2739	fg => [0, 0, 0, 1],
2620	ellipsise => 0,	2740	ellipsise => 0,
2621	font => ($widget->{tooltip_font} || $::FONT_PROP),	2741	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2629		2749
2630	($w + 4, $h + 4)	2750	($w + 4, $h + 4)
2631	}	2751	}
2632		2752
2633	sub size_allocate {	2753	sub size_allocate {
2634	my ($self, $w, $h, $changed) = @_;	2754	my ($self, $w, $h) = @_;
2635		2755
2636	return unless $changed;
2637
2638	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2756	$self->SUPER::size_allocate ($w - 4, $h - 4);
2639	}	2757	}
2640		2758
2641	sub visibility_change {	2759	sub visibility_change {
2642	my ($self, $visible) = @_;	2760	my ($self, $visible) = @_;
2643		2761
…		…
2650	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2768	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2651		2769
2652	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2770	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2653	if $x + $self->{w} > $::WIDTH;	2771	if $x + $self->{w} > $::WIDTH;
2654		2772
2655	$self->move ($x, $y);	2773	$self->move_abs ($x, $y);
2656	});	2774	});
2657	}	2775	}
2658		2776
2659	sub _draw {	2777	sub _draw {
2660	my ($self) = @_;	2778	my ($self) = @_;
…		…
2747	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2865	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2748		2866
2749	if ($tex) {	2867	if ($tex) {
2750	glEnable GL_TEXTURE_2D;	2868	glEnable GL_TEXTURE_2D;
2751	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2869	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2752	glColor 1, 1, 1, 1;	2870	glColor 0, 0, 0, 1;
2753	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2871	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2754	glDisable GL_TEXTURE_2D;	2872	glDisable GL_TEXTURE_2D;
2755	}	2873	}
2756	}	2874	}
2757		2875
…		…
2764	$self->SUPER::DESTROY;	2882	$self->SUPER::DESTROY;
2765	}	2883	}
2766		2884
2767	#############################################################################	2885	#############################################################################
2768		2886
2769	package CFClient::UI::Inventory;	2887	package CFClient::UI::Buttonbar;
2770		2888
2771	our @ISA = CFClient::UI::ScrolledWindow::;	2889	our @ISA = CFClient::UI::HBox::;
2772		2890
2773	sub new {	2891	# TODO: should actualyl wrap buttons and other goodies.
2774	my $class = shift;
2775
2776	my $self = $class->SUPER::new (
2777	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778	@_,
2779	);
2780
2781	$self
2782	}
2783
2784	sub set_items {
2785	my ($self, $items) = @_;
2786
2787	$self->{scrolled}->clear;
2788	return unless $items;
2789
2790	my @items = sort {
2791	($a->{type} <=> $b->{type})
2792	or ($a->{name} cmp $b->{name})
2793	} @$items;
2794
2795	$self->{real_items} = \@items;
2796
2797	my $row = 0;
2798	for my $item (@items) {
2799	CFClient::Item::update_widgets $item;
2800
2801	$self->{scrolled}->add (0, $row, $item->{face_widget});
2802	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2803	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805	$row++;
2806	}
2807	}
2808		2892
2809	#############################################################################	2893	#############################################################################
2810		2894
2811	package CFClient::UI::Menu;	2895	package CFClient::UI::Menu;
2812		2896
…		…
2853	# maybe save $GRAB? must be careful about events...	2937	# maybe save $GRAB? must be careful about events...
2854	$GRAB = $self;	2938	$GRAB = $self;
2855	$self->{button} = $ev->{button};	2939	$self->{button} = $ev->{button};
2856		2940
2857	$self->show;	2941	$self->show;
2858	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2942	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2859	}	2943	}
2860		2944
2861	sub mouse_motion {	2945	sub mouse_motion {
2862	my ($self, $ev, $x, $y) = @_;	2946	my ($self, $ev, $x, $y) = @_;
2863		2947
2864	# TODO: should use vbox->find_widget or so	2948	# TODO: should use vbox->find_widget or so
2865	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2949	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2866	$self->{hover} = $self->{item}{$HOVER};	2950	$self->{hover} = $self->{item}{$HOVER};
		2951
		2952	0
2867	}	2953	}
2868		2954
2869	sub button_up {	2955	sub button_up {
2870	my ($self, $ev, $x, $y) = @_;	2956	my ($self, $ev, $x, $y) = @_;
2871		2957
…		…
2873	undef $GRAB;	2959	undef $GRAB;
2874	$self->hide;	2960	$self->hide;
2875		2961
2876	$self->_emit ("popdown");	2962	$self->_emit ("popdown");
2877	$self->{hover}[1]->() if $self->{hover};	2963	$self->{hover}[1]->() if $self->{hover};
		2964	} else {
		2965	return 0
		2966	}
		2967
2878	}	2968	1
2879	}	2969	}
2880		2970
2881	#############################################################################	2971	#############################################################################
2882		2972
2883	package CFClient::UI::Statusbox;	2973	package CFClient::UI::Multiplexer;
2884		2974
2885	our @ISA = CFClient::UI::VBox::;	2975	our @ISA = CFClient::UI::Container::;
2886		2976
2887	sub new {	2977	sub new {
2888	my $class = shift;	2978	my $class = shift;
2889		2979
2890	$class->SUPER::new (	2980	my $self = $class->SUPER::new (
		2981	@_,
		2982	);
		2983
		2984	$self->{current} = $self->{children}[0]
		2985	if @{ $self->{children} };
		2986
		2987	$self
		2988	}
		2989
		2990	sub add {
		2991	my ($self, @widgets) = @_;
		2992
		2993	$self->SUPER::add (@widgets);
		2994
		2995	$self->{current} = $self->{children}[0]
		2996	if @{ $self->{children} };
		2997	}
		2998
		2999	sub set_current_page {
		3000	my ($self, $page_or_widget) = @_;
		3001
		3002	my $widget = ref $page_or_widget
		3003	? $page_or_widget
		3004	: $self->{children}[$page_or_widget];
		3005
		3006	$self->{current} = $widget;
		3007	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3008
		3009	$self->_emit (page_changed => $self->{current});
		3010
		3011	$self->realloc;
		3012	}
		3013
		3014	sub visible_children {
		3015	$_[0]{current}
		3016	}
		3017
		3018	sub size_request {
		3019	my ($self) = @_;
		3020
		3021	$self->{current}->size_request
		3022	}
		3023
		3024	sub size_allocate {
		3025	my ($self, $w, $h) = @_;
		3026
		3027	$self->{current}->configure (0, 0, $w, $h);
		3028	}
		3029
		3030	sub _draw {
		3031	my ($self) = @_;
		3032
		3033	$self->{current}->draw;
		3034	}
		3035
		3036	#############################################################################
		3037
		3038	package CFClient::UI::Notebook;
		3039
		3040	our @ISA = CFClient::UI::VBox::;
		3041
		3042	sub new {
		3043	my $class = shift;
		3044
		3045	my $self = $class->SUPER::new (
		3046	buttonbar => (new CFClient::UI::Buttonbar),
		3047	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3048	# filter => # will be put between multiplexer and $self
		3049	@_,
		3050	);
		3051
		3052	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3053	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3054
		3055	$self
		3056	}
		3057
		3058	sub add {
		3059	my ($self, $title, $widget, $tooltip) = @_;
		3060
		3061	Scalar::Util::weaken $self;
		3062
		3063	$self->{buttonbar}->add (new CFClient::UI::Button
		3064	markup => $title,
		3065	tooltip => $tooltip,
		3066	on_activate => sub { $self->set_current_page ($widget) },
		3067	);
		3068
		3069	$self->{multiplexer}->add ($widget);
		3070	}
		3071
		3072	sub set_current_page {
		3073	my ($self, $page) = @_;
		3074
		3075	$self->{multiplexer}->set_current_page ($page);
		3076	$self->_emit (page_changed => $self->{multiplexer}{current});
		3077	}
		3078
		3079	#############################################################################
		3080
		3081	package CFClient::UI::Statusbox;
		3082
		3083	our @ISA = CFClient::UI::VBox::;
		3084
		3085	sub new {
		3086	my $class = shift;
		3087
		3088	my $self = $class->SUPER::new (
2891	fontsize => 0.8,	3089	fontsize => 0.8,
2892	@_,	3090	@_,
2893	)	3091	);
		3092
		3093	Scalar::Util::weaken (my $this = $self);
		3094
		3095	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3096
		3097	$self
2894	}	3098	}
2895		3099
2896	sub reorder {	3100	sub reorder {
2897	my ($self) = @_;	3101	my ($self) = @_;
2898	my $NOW = time;	3102	my $NOW = Time::HiRes::time;
		3103
		3104	# freeze display when hovering over any label
		3105	return if $CFClient::UI::TOOLTIP->{owner}
		3106	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3107	values %{ $self->{item} };
2899		3108
2900	while (my ($k, $v) = each %{ $self->{item} }) {	3109	while (my ($k, $v) = each %{ $self->{item} }) {
2901	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3110	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2902	}	3111	}
2903		3112
…		…
2906	my @items = sort {	3115	my @items = sort {
2907	$a->{pri} <=> $b->{pri}	3116	$a->{pri} <=> $b->{pri}
2908	or $b->{id} <=> $a->{id}	3117	or $b->{id} <=> $a->{id}
2909	} values %{ $self->{item} };	3118	} values %{ $self->{item} };
2910		3119
		3120	$self->{timer}->interval (1);
		3121
2911	my $count = 10 + 1;	3122	my $count = 10 + 1;
2912	for my $item (@items) {	3123	for my $item (@items) {
2913	last unless --$count;	3124	last unless --$count;
2914		3125
2915	push @widgets, $item->{label} ||= do {	3126	my $label = $item->{label} ||= do {
2916	# TODO: doesn't handle markup well (read as: at all)	3127	# TODO: doesn't handle markup well (read as: at all)
2917	my $short = $item->{count} > 1	3128	my $short = $item->{count} > 1
2918	? "<b>$item->{count} ×</b> $item->{text}"	3129	? "<b>$item->{count} ×</b> $item->{text}"
2919	: $item->{text};	3130	: $item->{text};
2920		3131
…		…
2928	tooltip => $item->{tooltip},	3139	tooltip => $item->{tooltip},
2929	tooltip_font => $::FONT_PROP,	3140	tooltip_font => $::FONT_PROP,
2930	tooltip_width => 0.67,	3141	tooltip_width => 0.67,
2931	fontsize => $item->{fontsize} || $self->{fontsize},	3142	fontsize => $item->{fontsize} || $self->{fontsize},
2932	max_w => $::WIDTH * 0.44,	3143	max_w => $::WIDTH * 0.44,
2933	fg => $item->{fg},	3144	fg => [@{ $item->{fg} }],
2934	can_events => 1,	3145	can_events => 1,
2935	can_hover => 1	3146	can_hover => 1
2936	};	3147	};
		3148
		3149	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3150	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3151	$label->update;
		3152	$label->set_max_size (undef, $label->{req_h} * $diff)
		3153	if $diff < 1;
		3154	$self->{timer}->interval (1/30);
		3155	} else {
		3156	$label->{fg}[3] = $item->{fg}[3] || 1;
		3157	}
		3158
		3159	push @widgets, $label;
2937	}	3160	}
2938		3161
2939	$self->clear;	3162	$self->clear;
2940	$self->SUPER::add (reverse @widgets);	3163	$self->SUPER::add (reverse @widgets);
2941	}	3164	}
…		…
2946	$text =~ s/^\s+//;	3169	$text =~ s/^\s+//;
2947	$text =~ s/\s+$//;	3170	$text =~ s/\s+$//;
2948		3171
2949	return unless $text;	3172	return unless $text;
2950		3173
2951	my $timeout = time + ((delete $arg{timeout}) || 60);	3174	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2952		3175
2953	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3176	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2954		3177
2955	if (my $item = $self->{item}{$group}) {	3178	if (my $item = $self->{item}{$group}) {
2956	if ($item->{text} eq $text) {	3179	if ($item->{text} eq $text) {
…		…
2986		3209
2987	$self->reorder;	3210	$self->reorder;
2988	$self->SUPER::reconfigure;	3211	$self->SUPER::reconfigure;
2989	}	3212	}
2990		3213
		3214	sub DESTROY {
		3215	my ($self) = @_;
		3216
		3217	$self->{timer}->cancel;
		3218
		3219	$self->SUPER::DESTROY;
		3220	}
		3221
2991	#############################################################################	3222	#############################################################################
2992		3223
		3224	package CFClient::UI::Inventory;
		3225
		3226	our @ISA = CFClient::UI::ScrolledWindow::;
		3227
		3228	sub new {
		3229	my $class = shift;
		3230
		3231	my $self = $class->SUPER::new (
		3232	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3233	@_,
		3234	);
		3235
		3236	$self
		3237	}
		3238
		3239	sub set_items {
		3240	my ($self, $items) = @_;
		3241
		3242	$self->{child}->clear;
		3243	return unless $items;
		3244
		3245	my @items = sort {
		3246	($a->{type} <=> $b->{type})
		3247	or ($a->{name} cmp $b->{name})
		3248	} @$items;
		3249
		3250	$self->{real_items} = \@items;
		3251
		3252	my $row = 0;
		3253	for my $item (@items) {
		3254	CFClient::Item::update_widgets $item;
		3255
		3256	$self->{child}->add (0, $row, $item->{face_widget});
		3257	$self->{child}->add (1, $row, $item->{desc_widget});
		3258	$self->{child}->add (2, $row, $item->{weight_widget});
		3259
		3260	$row++;
		3261	}
		3262	}
		3263
		3264	#############################################################################
		3265
		3266	package CFClient::UI::BindEditor;
		3267
		3268	our @ISA = CFClient::UI::FancyFrame::;
		3269
		3270	sub new {
		3271	my $class = shift;
		3272
		3273	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3274
		3275	$self->add (my $vb = new CFClient::UI::VBox);
		3276
		3277
		3278	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3279	text => "start recording",
		3280	tooltip => "Start/Stops recording of actions."
		3281	."All subsequent actions after the recording started will be captured."
		3282	."The actions are displayed after the record was stopped."
		3283	."To bind the action you have to click on the 'Bind' button",
		3284	on_activate => sub {
		3285	unless ($self->{recording}) {
		3286	$self->start;
		3287	} else {
		3288	$self->stop;
		3289	}
		3290	});
		3291
		3292	$vb->add (new CFClient::UI::Label text => "Actions:");
		3293	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3294
		3295	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3296	$vb->add (my $hb = new CFClient::UI::HBox);
		3297	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3298	$hb->add (new CFClient::UI::Button
		3299	text => "bind",
		3300	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3301	on_activate => sub {
		3302	$self->ask_for_bind;
		3303	});
		3304
		3305	$vb->add (my $hb = new CFClient::UI::HBox);
		3306	$hb->add (new CFClient::UI::Button
		3307	text => "ok",
		3308	expand => 1,
		3309	tooltip => "This closes the binding editor and saves the binding",
		3310	on_activate => sub {
		3311	$self->hide;
		3312	$self->commit;
		3313	});
		3314
		3315	$hb->add (new CFClient::UI::Button
		3316	text => "cancel",
		3317	expand => 1,
		3318	tooltip => "This closes the binding editor without saving",
		3319	on_activate => sub {
		3320	$self->hide;
		3321	$self->{binding_cancel}->()
		3322	if $self->{binding_cancel};
		3323	});
		3324
		3325	$self->update_binding_widgets;
		3326
		3327	$self
		3328	}
		3329
		3330	sub commit {
		3331	my ($self) = @_;
		3332	my ($mod, $sym, $cmds) = $self->get_binding;
		3333	if ($sym != 0 && @$cmds > 0) {
		3334	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3335	."'. Don't forget 'Save Config'!");
		3336	$self->{binding_change}->($mod, $sym, $cmds)
		3337	if $self->{binding_change};
		3338	} else {
		3339	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3340	$self->{binding_cancel}->()
		3341	if $self->{binding_cancel};
		3342	}
		3343	}
		3344
		3345	sub start {
		3346	my ($self) = @_;
		3347
		3348	$self->{rec_btn}->set_text ("stop recording");
		3349	$self->{recording} = 1;
		3350	$self->clear_command_list;
		3351	$::CONN->start_record if $::CONN;
		3352	}
		3353
		3354	sub stop {
		3355	my ($self) = @_;
		3356
		3357	$self->{rec_btn}->set_text ("start recording");
		3358	$self->{recording} = 0;
		3359
		3360	my $rec;
		3361	$rec = $::CONN->stop_record if $::CONN;
		3362	return unless ref $rec eq 'ARRAY';
		3363	$self->set_command_list ($rec);
		3364	}
		3365
		3366
		3367	sub ask_for_bind_and_commit {
		3368	my ($self) = @_;
		3369	$self->ask_for_bind (1);
		3370	}
		3371
		3372	sub ask_for_bind {
		3373	my ($self, $commit) = @_;
		3374
		3375	CFClient::Binder::open_binding_dialog (sub {
		3376	my ($mod, $sym) = @_;
		3377	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3378	$self->update_binding_widgets;
		3379	$self->commit if $commit;
		3380	});
		3381	}
		3382
		3383	# $mod and $sym are the modifiers and key symbol
		3384	# $cmds is a array ref of strings (the commands)
		3385	# $cb is the callback that is executed on OK
		3386	# $ccb is the callback that is executed on CANCEL and
		3387	# when the binding was unsuccessful on OK
		3388	sub set_binding {
		3389	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3390
		3391	$self->clear_command_list;
		3392	$self->{recording} = 0;
		3393	$self->{rec_btn}->set_text ("start recording");
		3394
		3395	$self->{binding} = [$mod, $sym];
		3396	$self->{commands} = $cmds;
		3397
		3398	$self->{binding_change} = $cb;
		3399	$self->{binding_cancel} = $ccb;
		3400
		3401	$self->update_binding_widgets;
		3402	}
		3403
		3404	# this is a shortcut method that asks for a binding
		3405	# and then just binds it.
		3406	sub do_quick_binding {
		3407	my ($self, $cmds) = @_;
		3408	$self->set_binding (undef, undef, $cmds, sub {
		3409	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3410	});
		3411	$self->ask_for_bind (1);
		3412	}
		3413
		3414	sub update_binding_widgets {
		3415	my ($self) = @_;
		3416	my ($mod, $sym, $cmds) = $self->get_binding;
		3417	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3418	$self->set_command_list ($cmds);
		3419	}
		3420
		3421	sub get_binding {
		3422	my ($self) = @_;
		3423	return (
		3424	$self->{binding}->[0],
		3425	$self->{binding}->[1],
		3426	[ grep { defined $_ } @{$self->{commands}} ]
		3427	);
		3428	}
		3429
		3430	sub clear_command_list {
		3431	my ($self) = @_;
		3432	$self->{cmdbox}->clear ();
		3433	}
		3434
		3435	sub set_command_list {
		3436	my ($self, $cmds) = @_;
		3437
		3438	$self->{cmdbox}->clear ();
		3439	$self->{commands} = $cmds;
		3440
		3441	my $idx = 0;
		3442
		3443	for (@$cmds) {
		3444	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3445
		3446	my $i = $idx;
		3447	$hb->add (new CFClient::UI::Label text => $_);
		3448	$hb->add (new CFClient::UI::Button
		3449	text => "delete",
		3450	tooltip => "Deletes the action from the record",
		3451	on_activate => sub {
		3452	$self->{cmdbox}->remove ($hb);
		3453	$cmds->[$i] = undef;
		3454	});
		3455
		3456
		3457	$idx++
		3458	}
		3459	}
		3460
		3461	#############################################################################
		3462
		3463	package CFClient::UI::SpellList;
		3464
		3465	our @ISA = CFClient::UI::Table::;
		3466
		3467	sub new {
		3468	my $class = shift;
		3469
		3470	my $self = $class->SUPER::new (
		3471	binding => [],
		3472	commands => [],
		3473	@_,
		3474	)
		3475	}
		3476
		3477	# XXX: Do sorting? Argl...
		3478	sub add_spell {
		3479	my ($self, $spell) = @_;
		3480	$self->{spells}->{$spell->{name}} = $spell;
		3481
		3482	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3483	face => $spell->{face},
		3484	can_hover => 1,
		3485	can_events => 1,
		3486	tooltip => $spell->{message});
		3487
		3488	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3489	text => $spell->{name},
		3490	can_hover => 1,
		3491	can_events => 1,
		3492	tooltip => $spell->{message},
		3493	expand => 1);
		3494
		3495	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3496	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3497	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3498	expand => 1);
		3499
		3500	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3501	text => "bind to key",
		3502	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3503	}
		3504
		3505	sub rebuild_spell_list {
		3506	my ($self) = @_;
		3507	$self->{tbl_idx} = 0;
		3508	$self->add_spell ($_) for values %{$self->{spells}};
		3509	}
		3510
		3511	sub remove_spell {
		3512	my ($self, $spell) = @_;
		3513	delete $self->{spells}->{$spell->{name}};
		3514	$self->rebuild_spell_list;
		3515	}
		3516
		3517	#############################################################################
		3518
2993	package CFClient::UI::Root;	3519	package CFClient::UI::Root;
2994		3520
2995	our @ISA = CFClient::UI::Container::;	3521	our @ISA = CFClient::UI::Container::;
		3522
		3523	use List::Util qw(min max);
2996		3524
2997	use CFClient::OpenGL;	3525	use CFClient::OpenGL;
2998		3526
2999	sub new {	3527	sub new {
3000	my $class = shift;	3528	my $class = shift;
…		…
3007	Scalar::Util::weaken ($self->{root} = $self);	3535	Scalar::Util::weaken ($self->{root} = $self);
3008		3536
3009	$self	3537	$self
3010	}	3538	}
3011		3539
3012	sub configure {
3013	my ($self, $x, $y, $w, $h) = @_;
3014
3015	$self->{w} = $w;
3016	$self->{h} = $h;
3017	}
3018
3019	sub reconfigure {
3020	my ($self) = @_;
3021
3022	$self->SUPER::reconfigure;
3023
3024	$self->size_allocate ($self->{w}, $self->{h}, 1)
3025	if $self->{w};
3026	}
3027
3028	sub size_request {	3540	sub size_request {
3029	my ($self) = @_;	3541	my ($self) = @_;
3030		3542
3031	($self->{w}, $self->{h})	3543	($self->{w}, $self->{h})
3032	}	3544	}
3033		3545
		3546	sub _to_pixel {
		3547	my ($coord, $size, $max) = @_;
		3548
		3549	$coord =
		3550	$coord eq "center" ? ($max - $size) * 0.5
		3551	: $coord eq "max" ? $max
		3552	: $coord;
		3553
		3554	$coord = 0 if $coord < 0;
		3555	$coord = $max - $size if $coord > $max - $size;
		3556
		3557	int $coord + 0.5
		3558	}
		3559
3034	sub size_allocate {	3560	sub size_allocate {
3035	my ($self, $w, $h, $changed) = @_;	3561	my ($self, $w, $h) = @_;
3036		3562
3037	for my $child ($self->children) {	3563	for my $child ($self->children) {
3038	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3564	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3039		3565
3040	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3566	$X = $child->{force_x} if exists $child->{force_x};
3041	if exists $child->{req_x};	3567	$Y = $child->{force_y} if exists $child->{force_y};
3042		3568
3043	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3569	$X = _to_pixel $X, $W, $self->{w};
3044	if exists $child->{req_y};	3570	$Y = _to_pixel $Y, $H, $self->{h};
3045
3046	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
3047
3048	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050		3571
3051	$child->configure ($X, $Y, $W, $H);	3572	$child->configure ($X, $Y, $W, $H);
3052	}	3573	}
3053	}	3574	}
3054		3575
…		…
3071	}	3592	}
3072		3593
3073	sub add {	3594	sub add {
3074	my ($self, @children) = @_;	3595	my ($self, @children) = @_;
3075		3596
3076	for my $child (@children) {
3077	$child->{is_toplevel} = 1;	3597	$_->{is_toplevel} = 1
3078		3598	for @children;
3079	# integerise window positions
3080	$child->{x} = int $child->{x};
3081	$child->{y} = int $child->{y};
3082	}
3083		3599
3084	$self->SUPER::add (@children);	3600	$self->SUPER::add (@children);
3085	}	3601	}
3086		3602
3087	sub remove {	3603	sub remove {
3088	my ($self, @children) = @_;	3604	my ($self, @children) = @_;
3089		3605
3090	$self->SUPER::remove (@children);	3606	$self->SUPER::remove (@children);
		3607
		3608	delete $self->{is_toplevel}
		3609	for @children;
3091		3610
3092	while (@children) {	3611	while (@children) {
3093	my $w = pop @children;	3612	my $w = pop @children;
3094	push @children, $w->children;	3613	push @children, $w->children;
3095	$w->set_invisible;	3614	$w->set_invisible;
…		…
3115	$_->()	3634	$_->()
3116	for values %{delete $self->{refresh_hook}};	3635	for values %{delete $self->{refresh_hook}};
3117	}	3636	}
3118		3637
3119	if ($self->{realloc}) {	3638	if ($self->{realloc}) {
		3639	my %queue;
3120	my @queue;	3640	my @queue;
		3641	my $widget;
3121		3642
		3643	outer:
3122	while () {	3644	while () {
3123	if ($self->{realloc}) {	3645	if (my $realloc = delete $self->{realloc}) {
3124	#TODO use array-of-depth approach	3646	for $widget (values %$realloc) {
		3647	$widget->{visible} or next; # do not resize invisible widgets
3125		3648
3126	@queue = sort { $a->{visible} <=> $b->{visible} }	3649	$queue{$widget+0}++ and next; # duplicates are common
3127	@queue, values %{delete $self->{realloc}};	3650
		3651	push @{ $queue[$widget->{visible}] }, $widget;
		3652	}
3128	}	3653	}
3129		3654
		3655	while () {
		3656	@queue or last outer;
		3657
		3658	$widget = pop @{ $queue[-1] || [] }
		3659	and last;
		3660
		3661	pop @queue;
		3662	}
		3663
		3664	delete $queue{$widget+0};
		3665
		3666	my ($w, $h) = $widget->size_request;
		3667
		3668	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3669	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3670
		3671	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3672	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3673
		3674	$w = $widget->{force_w} if exists $widget->{force_w};
		3675	$h = $widget->{force_h} if exists $widget->{force_h};
		3676
		3677	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3678	|| delete $widget->{force_realloc}) {
		3679	$widget->{req_w} = $w;
		3680	$widget->{req_h} = $h;
		3681
		3682	$self->{size_alloc}{$widget+0} = $widget;
		3683
		3684	if (my $parent = $widget->{parent}) {
		3685	$self->{realloc}{$parent+0} = $parent
		3686	unless $queue{$parent+0};
		3687
		3688	$parent->{force_size_alloc} = 1;
		3689	$self->{size_alloc}{$parent+0} = $parent;
		3690	}
		3691	}
		3692
		3693	delete $self->{realloc}{$widget+0};
		3694	}
		3695	}
		3696
		3697	while (my $size_alloc = delete $self->{size_alloc}) {
		3698	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3699	values %$size_alloc;
		3700
		3701	while () {
3130	my $widget = pop @queue || last;	3702	my $widget = pop @queue || last;
3131		3703
3132	$widget->{visible} or last; # do not resize invisible widgets	3704	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3133
3134	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3135	? @$widget{qw(def_w def_h)}
3136	: $widget->size_request;
3137
3138	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3139
3140	$widget->{req_w} = $w;
3141	$widget->{req_h} = $h;
3142
3143	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3144
3145	push @queue, $widget->{parent}
3146	if $widget->{parent};
3147	}
3148	}
3149
3150	while (my $size_alloc = delete $self->{size_alloc}) {
3151	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3152	values %$size_alloc;
3153
3154	while () {
3155	my ($widget, $w, $h) = @{ pop @queue or last };
3156		3705
3157	$w = 0 if $w < 0;	3706	$w = 0 if $w < 0;
3158	$h = 0 if $h < 0;	3707	$h = 0 if $h < 0;
3159		3708
3160	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3709	$w = int $w + 0.5;
		3710	$h = int $h + 0.5;
3161		3711
		3712	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3713	$widget->{old_w} = $widget->{w};
		3714	$widget->{old_h} = $widget->{h};
		3715
3162	$widget->{w} = $w;	3716	$widget->{w} = $w;
3163	$widget->{h} = $h;	3717	$widget->{h} = $h;
3164		3718
3165	$widget->emit (size_allocate => $w, $h, $changed);	3719	$widget->emit (size_allocate => $w, $h);
		3720	}
3166	}	3721	}
3167	}	3722	}
3168		3723
3169	while ($self->{post_alloc_hook}) {	3724	while ($self->{post_alloc_hook}) {
3170	$_->()	3725	$_->()
3171	for values %{delete $self->{post_alloc_hook}};	3726	for values %{delete $self->{post_alloc_hook}};
3172	}	3727	}
		3728
3173		3729
3174	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3730	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3175	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3731	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3176	glClear GL_COLOR_BUFFER_BIT;	3732	glClear GL_COLOR_BUFFER_BIT;
3177		3733
…		…
3179	glLoadIdentity;	3735	glLoadIdentity;
3180	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3736	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3181	glMatrixMode GL_MODELVIEW;	3737	glMatrixMode GL_MODELVIEW;
3182	glLoadIdentity;	3738	glLoadIdentity;
3183		3739
		3740	{
		3741	package CFClient::UI::Base;
		3742
		3743	($draw_x, $draw_y, $draw_w, $draw_h) =
		3744	(0, 0, $self->{w}, $self->{h});
		3745	}
		3746
3184	$self->_draw;	3747	$self->_draw;
3185	}	3748	}
3186		3749
3187	#############################################################################	3750	#############################################################################
3188		3751

Diff Legend

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