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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.305 by root, Sun Jun 18 17:13:12 2006 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
		8	use Event;
8		9
9	use CFClient;	10	use CFClient;
10	use CFClient::Texture;	11	use CFClient::Texture;
11		12
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
…		…
15	our $ROOT;	16	our $ROOT;
16	our $TOOLTIP;	17	our $TOOLTIP;
17	our $BUTTON_STATE;	18	our $BUTTON_STATE;
18		19
19	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
		21
		22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
		23	if (!$GRAB) {
		24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		25	if (length $widget->{tooltip}) {
		26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->hide;
		28
		29	$TOOLTIP->{owner} = $widget;
		30
		31	return if $ENV{CFPLUS_DEBUG} & 8;
		32
		33	my $tip = $widget->{tooltip};
		34
		35	$tip = $tip->($widget) if CODE:: eq ref $tip;
		36
		37	$TOOLTIP->set_tooltip_from ($widget);
		38	$TOOLTIP->show;
		39	}
		40
		41	return;
		42	}
		43	}
		44	}
		45
		46	$TOOLTIP->hide;
		47	delete $TOOLTIP->{owner};
		48	});
20		49
21	sub get_layout {	50	sub get_layout {
22	my $layout;	51	my $layout;
23		52
24	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
39	my ($layout) = @_;	68	my ($layout) = @_;
40		69
41	$LAYOUT = $layout;	70	$LAYOUT = $layout;
42	}	71	}
43		72
44	sub check_tooltip {
45	return if $ENV{CFPLUS_DEBUG} & 8;
46
47	if (!$GRAB) {
48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49	if (length $widget->{tooltip}) {
50	if ($TOOLTIP->{owner} != $widget) {
51	$TOOLTIP->hide;
52
53	$TOOLTIP->{owner} = $widget;
54
55	my $tip = $widget->{tooltip};
56
57	$tip = $tip->($widget) if CODE:: eq ref $tip;
58
59	$TOOLTIP->set_tooltip_from ($widget);
60	$TOOLTIP->show;
61	}
62
63	return;
64	}
65	}
66	}
67
68	$TOOLTIP->hide;
69	delete $TOOLTIP->{owner};
70	}
71
72	# class methods for events	73	# class methods for events
73	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
74	$FOCUS->emit (key_down => $_[0])	75	$FOCUS->emit (key_down => $_[0])
75	if $FOCUS;	76	if $FOCUS;
76	}	77	}
…		…
88	my $widget = $ROOT->find_widget ($x, $y);	89	my $widget = $ROOT->find_widget ($x, $y);
89		90
90	$GRAB = $widget;	91	$GRAB = $widget;
91	$GRAB->update if $GRAB;	92	$GRAB->update if $GRAB;
92		93
93	check_tooltip;	94	$TOOLTIP_WATCHER->cb->();
94	}	95	}
95		96
96	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
97		98
98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
…		…
113	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
114	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
115	$grab->update if $grab;	116	$grab->update if $grab;
116	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
117		118
118	check_tooltip;	119	$TOOLTIP_WATCHER->cb->();
119	}	120	}
120	}	121	}
121		122
122	sub feed_sdl_motion_event {	123	sub feed_sdl_motion_event {
123	my ($ev) = @_;	124	my ($ev) = @_;
…		…
129	my $hover = $HOVER; $HOVER = $widget;	130	my $hover = $HOVER; $HOVER = $widget;
130		131
131	$hover->update if $hover && $hover->{can_hover};	132	$hover->update if $hover && $hover->{can_hover};
132	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
133		134
134	check_tooltip;	135	$TOOLTIP_WATCHER->start;
135	}	136	}
136		137
137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138	if $HOVER;	139	if $HOVER;
139	}	140	}
…		…
271		272
272	return unless $self->{visible};	273	return unless $self->{visible};
273		274
274	$_->set_invisible for $self->children;	275	$_->set_invisible for $self->children;
275		276
		277	delete $self->{visible};
276	delete $self->{root};	278	delete $self->{root};
277	delete $self->{visible};
278		279
279	undef $GRAB if $GRAB == $self;	280	undef $GRAB if $GRAB == $self;
280	undef $HOVER if $HOVER == $self;	281	undef $HOVER if $HOVER == $self;
281		282
282	CFClient::UI::check_tooltip	283	$CFClient::UI::TOOLTIP_WATCHER->cb->()
283	if $TOOLTIP->{owner} == $self;	284	if $TOOLTIP->{owner} == $self;
284		285
285	$self->focus_out;	286	$self->emit ("focus_out");
286
287	$self->emit (visibility_change => 0);	287	$self->emit (visibility_change => 0);
288	}	288	}
289		289
290	sub set_visibility {	290	sub set_visibility {
291	my ($self, $visible) = @_;	291	my ($self, $visible) = @_;
…		…
314	}	314	}
315		315
316	sub move_abs {	316	sub move_abs {
317	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
318		318
319	$self->{x} = List::Util::max 0, int $x;	319	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320	$self->{y} = List::Util::max 0, int $y;	320	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
322		322
323	$self->update;	323	$self->update;
324	}	324	}
325		325
…		…
366		366
367	$self->{root}{size_alloc}{$self+0} = $self;	367	$self->{root}{size_alloc}{$self+0} = $self;
368	}	368	}
369	}	369	}
370		370
371	sub size_allocate {
372	# nothing to be done
373	}
374
375	sub children {	371	sub children {
376	# nop	372	# nop
377	}	373	}
378		374
379	sub visible_children {	375	sub visible_children {
…		…
381	}	377	}
382		378
383	sub set_max_size {	379	sub set_max_size {
384	my ($self, $w, $h) = @_;	380	my ($self, $w, $h) = @_;
385		381
386	delete $self->{max_w}; $self->{max_w} = $w if $w;	382	$self->{max_w} = int $w if defined $w;
387	delete $self->{max_h}; $self->{max_h} = $h if $h;	383	$self->{max_h} = int $h if defined $h;
		384
		385	$self->realloc;
388	}	386	}
389		387
390	sub set_tooltip {	388	sub set_tooltip {
391	my ($self, $tooltip) = @_;	389	my ($self, $tooltip) = @_;
392		390
…		…
397		395
398	$self->{tooltip} = $tooltip;	396	$self->{tooltip} = $tooltip;
399		397
400	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401	delete $CFClient::UI::TOOLTIP->{owner};	399	delete $CFClient::UI::TOOLTIP->{owner};
402	CFClient::UI::check_tooltip;	400	$CFClient::UI::TOOLTIP_WATCHER->cb->();
403	}	401	}
404	}	402	}
405		403
406	# translate global coordinates to local coordinate system	404	# translate global coordinates to local coordinate system
407	sub coord2local {	405	sub coord2local {
…		…
415	my ($self, $x, $y) = @_;	413	my ($self, $x, $y) = @_;
416		414
417	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418	}	416	}
419		417
420	sub focus_in {	418	sub invoke_focus_in {
421	my ($self) = @_;	419	my ($self) = @_;
422		420
423	return if $FOCUS == $self;	421	return if $FOCUS == $self;
424	return unless $self->{can_focus};	422	return unless $self->{can_focus};
425		423
426	my $focus = $FOCUS; $FOCUS = $self;	424	my $focus = $FOCUS; $FOCUS = $self;
427		425
428	$self->_emit (focus_in => $focus);
429
430	$focus->update if $focus;	426	$focus->update if $focus;
431	$FOCUS->update;	427	$FOCUS->update;
432	}
433		428
		429	0
		430	}
		431
434	sub focus_out {	432	sub invoke_focus_out {
435	my ($self) = @_;	433	my ($self) = @_;
436		434
437	return unless $FOCUS == $self;	435	return unless $FOCUS == $self;
438		436
439	my $focus = $FOCUS; undef $FOCUS;	437	my $focus = $FOCUS; undef $FOCUS;
440		438
441	$self->_emit (focus_out => $focus);
442
443	$focus->update if $focus; #?	439	$focus->update if $focus; #?
444		440
445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	442	unless $FOCUS;
447	}
448		443
		444	0
		445	}
		446
		447	sub grab_focus {
		448	my ($self) = @_;
		449
		450	$self->emit ("focus_in");
		451	}
		452
449	sub mouse_motion { 0 }	453	sub invoke_mouse_motion { 1 }
450	sub button_up { 0 }	454	sub invoke_button_up { 1 }
451	sub key_down { 0 }	455	sub invoke_key_down { 1 }
452	sub key_up { 0 }	456	sub invoke_key_up { 1 }
453		457
454	sub button_down {	458	sub invoke_button_down {
455	my ($self, $ev, $x, $y) = @_;	459	my ($self, $ev, $x, $y) = @_;
456		460
457	$self->focus_in;	461	$self->grab_focus;
458		462
459	0	463	1
		464	}
		465
		466	sub connect {
		467	my ($self, $signal, $cb) = @_;
		468
		469	push @{ $self->{signal_cb}{$signal} }, $cb;
		470	}
		471
		472	sub emit {
		473	my ($self, $signal, @args) = @_;
		474
		475	(List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before
		476	($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure
		477	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460	}	478	}
461		479
462	sub find_widget {	480	sub find_widget {
463	my ($self, $x, $y) = @_;	481	my ($self, $x, $y) = @_;
464		482
…		…
474	sub set_parent {	492	sub set_parent {
475	my ($self, $parent) = @_;	493	my ($self, $parent) = @_;
476		494
477	Scalar::Util::weaken ($self->{parent} = $parent);	495	Scalar::Util::weaken ($self->{parent} = $parent);
478	$self->set_visible if $parent->{visible};	496	$self->set_visible if $parent->{visible};
479	}
480
481	sub connect {
482	my ($self, $signal, $cb) = @_;
483
484	push @{ $self->{signal_cb}{$signal} }, $cb;
485	}
486
487	sub _emit {
488	my ($self, $signal, @args) = @_;
489
490	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491	}
492
493	sub emit {
494	my ($self, $signal, @args) = @_;
495
496	$self->_emit ($signal, @args)
497	|| $self->$signal (@args);
498	}
499
500	sub visibility_change {
501	#my ($self, $visible) = @_;
502	}	497	}
503		498
504	sub realloc {	499	sub realloc {
505	my ($self) = @_;	500	my ($self) = @_;
506		501
…		…
548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	543	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	544	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550		545
551	glPushMatrix;	546	glPushMatrix;
552	glTranslate $self->{x}, $self->{y}, 0;	547	glTranslate $self->{x}, $self->{y}, 0;
553	$self->_draw;
554	glPopMatrix;
555		548
556	if ($self == $HOVER && $self->{can_hover}) {	549	if ($self == $HOVER && $self->{can_hover}) {
557	my ($x, $y) = @$self{qw(x y)};
558
559	glColor 1, 0.8, 0.5, 0.2;	550	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560	glEnable GL_BLEND;	551	glEnable GL_BLEND;
561	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	552	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562	glBegin GL_QUADS;	553	glBegin GL_QUADS;
563	glVertex $x , $y;	554	glVertex 0 , 0;
564	glVertex $x + $self->{w}, $y;	555	glVertex $self->{w}, 0;
565	glVertex $x + $self->{w}, $y + $self->{h};	556	glVertex $self->{w}, $self->{h};
566	glVertex $x , $y + $self->{h};	557	glVertex 0 , $self->{h};
567	glEnd;	558	glEnd;
568	glDisable GL_BLEND;	559	glDisable GL_BLEND;
569	}	560	}
570		561
571	if ($ENV{CFPLUS_DEBUG} & 1) {	562	if ($ENV{CFPLUS_DEBUG} & 1) {
572	glPushMatrix;	563	glPushMatrix;
573	glColor 1, 1, 0, 1;	564	glColor 1, 1, 0, 1;
574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	565	glTranslate 0.375, 0.375;
575	glBegin GL_LINE_LOOP;	566	glBegin GL_LINE_LOOP;
576	glVertex 0 , 0;	567	glVertex 0 , 0;
577	glVertex $self->{w} - 1, 0;	568	glVertex $self->{w} - 1, 0;
578	glVertex $self->{w} - 1, $self->{h} - 1;	569	glVertex $self->{w} - 1, $self->{h} - 1;
579	glVertex 0 , $self->{h} - 1;	570	glVertex 0 , $self->{h} - 1;
580	glEnd;	571	glEnd;
581	glPopMatrix;	572	glPopMatrix;
582	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	573	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583	}	574	}
		575
		576	$self->_draw;
		577	glPopMatrix;
584	}	578	}
585		579
586	sub _draw {	580	sub _draw {
587	my ($self) = @_;	581	my ($self) = @_;
588		582
…		…
591		585
592	sub DESTROY {	586	sub DESTROY {
593	my ($self) = @_;	587	my ($self) = @_;
594		588
595	delete $WIDGET{$self+0};	589	delete $WIDGET{$self+0};
596	#$self->deactivate;	590
		591	eval { $self->destroy };
		592	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597	}	593	}
598		594
599	#############################################################################	595	#############################################################################
600		596
601	package CFClient::UI::DrawBG;	597	package CFClient::UI::DrawBG;
…		…
626		622
627	if ($color && (@$color < 4 || $color->[3])) {	623	if ($color && (@$color < 4 || $color->[3])) {
628	my ($w, $h) = @$self{qw(w h)};	624	my ($w, $h) = @$self{qw(w h)};
629		625
630	glEnable GL_BLEND;	626	glEnable GL_BLEND;
631	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	627	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632	glColor @$color;	628	glColor_premultiply @$color;
633		629
634	glBegin GL_QUADS;	630	glBegin GL_QUADS;
635	glVertex 0 , 0;	631	glVertex 0 , 0;
636	glVertex 0 , $h;	632	glVertex 0 , $h;
637	glVertex $w, $h;	633	glVertex $w, $h;
…		…
766	}	762	}
767		763
768	sub add {	764	sub add {
769	my ($self, $child) = @_;	765	my ($self, $child) = @_;
770		766
771	$self->{children} = [];	767	$self->SUPER::remove ($_) for @{ $self->{children} };
772
773	$self->SUPER::add ($child);	768	$self->SUPER::add ($child);
774	}	769	}
775		770
776	sub remove {	771	sub remove {
777	my ($self, $widget) = @_;	772	my ($self, $widget) = @_;
…		…
786		781
787	sub size_request {	782	sub size_request {
788	$_[0]{children}[0]->size_request	783	$_[0]{children}[0]->size_request
789	}	784	}
790		785
791	sub size_allocate {	786	sub invoke_size_allocate {
792	my ($self, $w, $h) = @_;	787	my ($self, $w, $h) = @_;
793		788
794	$self->{children}[0]->configure (0, 0, $w, $h);	789	$self->{children}[0]->configure (0, 0, $w, $h);
		790
		791	1
795	}	792	}
796		793
797	#############################################################################	794	#############################################################################
		795
		796	# back-buffered drawing area
798		797
799	package CFClient::UI::Window;	798	package CFClient::UI::Window;
800		799
801	our @ISA = CFClient::UI::Bin::;	800	our @ISA = CFClient::UI::Bin::;
802		801
…		…
813		812
814	$ROOT->on_post_alloc ($self => sub { $self->render_child });	813	$ROOT->on_post_alloc ($self => sub { $self->render_child });
815	$self->SUPER::update;	814	$self->SUPER::update;
816	}	815	}
817		816
818	sub size_allocate {	817	sub invoke_size_allocate {
819	my ($self, $w, $h) = @_;	818	my ($self, $w, $h) = @_;
820		819
821	$self->SUPER::size_allocate ($w, $h);
822	$self->update;	820	$self->update;
		821
		822	$self->SUPER::invoke_size_allocate ($w, $h)
823	}	823	}
824		824
825	sub _render {	825	sub _render {
826	my ($self) = @_;	826	my ($self) = @_;
827		827
…		…
854	my $tex = $self->{texture}	854	my $tex = $self->{texture}
855	or return;	855	or return;
856		856
857	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859	glColor 1, 1, 1, 1;	859	glColor 0, 0, 0, 1;
860		860
861	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	861	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862		862
863	glDisable GL_TEXTURE_2D;	863	glDisable GL_TEXTURE_2D;
864	}	864	}
…		…
888	$h = 10 if $self->{scroll_y};	888	$h = 10 if $self->{scroll_y};
889		889
890	($w, $h)	890	($w, $h)
891	}	891	}
892		892
893	sub size_allocate {	893	sub invoke_size_allocate {
894	my ($self, $w, $h) = @_;	894	my ($self, $w, $h) = @_;
895		895
896	my $child = $self->child;	896	my $child = $self->child;
897		897
898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900		900
901	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
902	$self->update;	902	$self->update;
		903
		904	1
903	}	905	}
904		906
905	sub set_offset {	907	sub set_offset {
906	my ($self, $x, $y) = @_;	908	my ($self, $x, $y) = @_;
907		909
…		…
955	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
956		958
957	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
958		960
959	sub new {	961	sub new {
960	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
961		965
962	my $self;	966	my $self;
963		967
964	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
965	vertical => 1,	969	vertical => 1,
…		…
970	;	974	;
971		975
972	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
973	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
974	slider => $slider,	978	slider => $slider,
975	@_,	979	%arg,
976	);	980	);
977		981
978	$self->{vp}->add ($self->{scrolled});
979	$self->add ($self->{vp});
980	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
981		984
982	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
983	}	992	}
984		993
985	sub update {	994	sub update {
986	my ($self) = @_;	995	my ($self) = @_;
987		996
…		…
990	# todo: overwrite size_allocate of child	999	# todo: overwrite size_allocate of child
991	my $child = $self->{vp}->child;	1000	my $child = $self->{vp}->child;
992	$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]);
993	}	1002	}
994		1003
995	sub size_allocate {	1004	sub invoke_size_allocate {
996	my ($self, $w, $h) = @_;	1005	my ($self, $w, $h) = @_;
997
998	$self->SUPER::size_allocate ($w, $h);
999		1006
1000	my $child = $self->{vp}->child;	1007	my $child = $self->{vp}->child;
1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1008	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		1009
		1010	$self->SUPER::invoke_size_allocate ($w, $h)
1002	}	1011	}
1003		1012
1004	#TODO# update range on size_allocate depending on child	1013	#TODO# update range on size_allocate depending on child
1005	# update viewport offset on scroll	1014	# update viewport offset on scroll
1006		1015
…		…
1026		1035
1027	if ($self->{bg}) {	1036	if ($self->{bg}) {
1028	my ($w, $h) = @$self{qw(w h)};	1037	my ($w, $h) = @$self{qw(w h)};
1029		1038
1030	glEnable GL_BLEND;	1039	glEnable GL_BLEND;
1031	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1040	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032	glColor @{ $self->{bg} };	1041	glColor_premultiply @{ $self->{bg} };
1033		1042
1034	glBegin GL_QUADS;	1043	glBegin GL_QUADS;
1035	glVertex 0 , 0;	1044	glVertex 0 , 0;
1036	glVertex 0 , $h;	1045	glVertex 0 , $h;
1037	glVertex $w, $h;	1046	glVertex $w, $h;
…		…
1060	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1061	qw(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);
1062		1071
1063	sub new {	1072	sub new {
1064	my ($class, %arg) = @_;	1073	my ($class, %arg) = @_;
1065
1066	my $title = delete $arg{title};
1067		1074
1068	my $self = $class->SUPER::new (	1075	my $self = $class->SUPER::new (
1069	bg => [1, 1, 1, 1],	1076	bg => [1, 1, 1, 1],
1070	border_bg => [1, 1, 1, 1],	1077	border_bg => [1, 1, 1, 1],
1071	border => 0.6,	1078	border => 0.6,
…		…
1073	min_w => 16,	1080	min_w => 16,
1074	min_h => 16,	1081	min_h => 16,
1075	%arg,	1082	%arg,
1076	);	1083	);
1077		1084
1078	$self->{title} = new CFClient::UI::Label	1085	$self->{title_widget} = new CFClient::UI::Label
1079	align => 0,	1086	align => 0,
1080	valign => 1,	1087	valign => 1,
1081	text => $title,	1088	text => $self->{title},
1082	fontsize => $self->{border}	1089	fontsize => $self->{border},
1083	if defined $title;	1090	if exists $self->{title};
		1091
		1092	if ($self->{has_close_button}) {
		1093	$self->{close_button} =
		1094	new CFClient::UI::ImageButton
		1095	image => 'x1_close.png',
		1096	on_activate => sub { $self->hide };
		1097
		1098	$self->CFClient::UI::Container::add ($self->{close_button});
		1099	}
1084		1100
1085	$self	1101	$self
1086	}	1102	}
1087		1103
1088	sub add {	1104	sub add {
1089	my ($self, @widgets) = @_;	1105	my ($self, @widgets) = @_;
1090		1106
1091	$self->SUPER::add (@widgets);	1107	$self->SUPER::add (@widgets);
		1108	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1092	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1109	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1093	}	1110	}
1094		1111
1095	sub border {	1112	sub border {
1096	int $_[0]{border} * $::FONTSIZE	1113	int $_[0]{border} * $::FONTSIZE
1097	}	1114	}
1098		1115
1099	sub size_request {	1116	sub size_request {
1100	my ($self) = @_;	1117	my ($self) = @_;
1101		1118
1102	$self->{title}->size_request	1119	$self->{title_widget}->size_request
1103	if $self->{title};	1120	if $self->{title_widget};
		1121
		1122	$self->{close_button}->size_request
		1123	if $self->{close_button};
1104		1124
1105	my ($w, $h) = $self->SUPER::size_request;	1125	my ($w, $h) = $self->SUPER::size_request;
1106		1126
1107	(	1127	(
1108	$w + $self->border * 2,	1128	$w + $self->border * 2,
1109	$h + $self->border * 2,	1129	$h + $self->border * 2,
1110	)	1130	)
1111	}	1131	}
1112		1132
1113	sub size_allocate {	1133	sub invoke_size_allocate {
1114	my ($self, $w, $h) = @_;	1134	my ($self, $w, $h) = @_;
1115		1135
1116	if ($self->{title}) {	1136	if ($self->{title_widget}) {
1117	$self->{title}{w} = $w;	1137	$self->{title_widget}{w} = $w;
1118	$self->{title}{h} = $h;	1138	$self->{title_widget}{h} = $h;
1119	$self->{title}->size_allocate ($w, $h);	1139	$self->{title_widget}->invoke_size_allocate ($w, $h);
1120	}	1140	}
1121		1141
1122	my $border = $self->border;	1142	my $border = $self->border;
1123		1143
1124	$h -= List::Util::max 0, $border * 2;	1144	$h -= List::Util::max 0, $border * 2;
1125	$w -= List::Util::max 0, $border * 2;	1145	$w -= List::Util::max 0, $border * 2;
1126		1146
1127	$self->child->configure ($border, $border, $w, $h);	1147	$self->child->configure ($border, $border, $w, $h);
1128	}
1129		1148
		1149	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1150	if $self->{close_button};
		1151
		1152	1
		1153	}
		1154
1130	sub button_down {	1155	sub invoke_button_down {
1131	my ($self, $ev, $x, $y) = @_;	1156	my ($self, $ev, $x, $y) = @_;
1132		1157
1133	my ($w, $h) = @$self{qw(w h)};	1158	my ($w, $h) = @$self{qw(w h)};
1134	my $border = $self->border;	1159	my $border = $self->border;
1135		1160
…		…
1151	my $dy = $ev->{y} - $oy;	1176	my $dy = $ev->{y} - $oy;
1152		1177
1153	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1178	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1179	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155		1180
		1181	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156	$self->realloc;	1182	$self->realloc;
1157	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158	};	1183	};
1159		1184
1160	} elsif ($lr ^ $td) {	1185	} elsif ($lr ^ $td) {
1161	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1186	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162	my ($bx, $by) = ($self->{x}, $self->{y});	1187	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1165	my ($ev, $x, $y) = @_;	1190	my ($ev, $x, $y) = @_;
1166		1191
1167	($x, $y) = ($ev->{x}, $ev->{y});	1192	($x, $y) = ($ev->{x}, $ev->{y});
1168		1193
1169	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1194	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1195	# HACK: the next line is required to enforce placement
		1196	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1170	};	1197	};
1171	} else {	1198	} else {
1172	return 0;	1199	return 0;
1173	}	1200	}
1174		1201
1175	1	1202	1
1176	}	1203	}
1177		1204
1178	sub button_up {	1205	sub invoke_button_up {
1179	my ($self, $ev, $x, $y) = @_;	1206	my ($self, $ev, $x, $y) = @_;
1180		1207
1181	!!delete $self->{motion}	1208	! ! delete $self->{motion}
1182	}	1209	}
1183		1210
1184	sub mouse_motion {	1211	sub invoke_mouse_motion {
1185	my ($self, $ev, $x, $y) = @_;	1212	my ($self, $ev, $x, $y) = @_;
1186		1213
1187	$self->{motion}->($ev, $x, $y) if $self->{motion};	1214	$self->{motion}->($ev, $x, $y) if $self->{motion};
1188		1215
1189	!!$self->{motion}	1216	! ! $self->{motion}
1190	}	1217	}
1191		1218
1192	sub _draw {	1219	sub _draw {
1193	my ($self) = @_;	1220	my ($self) = @_;
1194		1221
…		…
1220		1247
1221	glDisable GL_TEXTURE_2D;	1248	glDisable GL_TEXTURE_2D;
1222		1249
1223	$child->draw;	1250	$child->draw;
1224		1251
1225	if ($self->{title}) {	1252	if ($self->{title_widget}) {
1226	glTranslate 0, $border - $self->{h};	1253	glTranslate 0, $border - $self->{h};
1227	$self->{title}->_draw;	1254	$self->{title_widget}->_draw;
		1255
		1256	glTranslate 0, - ($border - $self->{h});
1228	}	1257	}
		1258
		1259	$self->{close_button}->draw
		1260	if $self->{close_button};
1229	}	1261	}
1230		1262
1231	#############################################################################	1263	#############################################################################
1232		1264
1233	package CFClient::UI::Table;	1265	package CFClient::UI::Table;
…		…
1256		1288
1257	$child->set_parent ($self);	1289	$child->set_parent ($self);
1258	$self->{children}[$y][$x] = $child;	1290	$self->{children}[$y][$x] = $child;
1259		1291
1260	$self->realloc;	1292	$self->realloc;
		1293	}
		1294
		1295	sub remove {
		1296	my ($self, $child) = @_;
		1297
		1298	# TODO: not yet implemented
1261	}	1299	}
1262		1300
1263	# TODO: move to container class maybe? send children a signal on removal?	1301	# TODO: move to container class maybe? send children a signal on removal?
1264	sub clear {	1302	sub clear {
1265	my ($self) = @_;	1303	my ($self) = @_;
…		…
1306	(sum @$ws),	1344	(sum @$ws),
1307	(sum @$hs),	1345	(sum @$hs),
1308	)	1346	)
1309	}	1347	}
1310		1348
1311	sub size_allocate {	1349	sub invoke_size_allocate {
1312	my ($self, $w, $h) = @_;	1350	my ($self, $w, $h) = @_;
1313		1351
1314	my ($ws, $hs) = $self->get_wh;	1352	my ($ws, $hs) = $self->get_wh;
1315		1353
1316	my $req_w = (sum @$ws) || 1;	1354	my $req_w = (sum @$ws) || 1;
…		…
1348	}	1386	}
1349		1387
1350	$y += $row_h;	1388	$y += $row_h;
1351	}	1389	}
1352		1390
		1391	1
1353	}	1392	}
1354		1393
1355	sub find_widget {	1394	sub find_widget {
1356	my ($self, $x, $y) = @_;	1395	my ($self, $x, $y) = @_;
1357		1396
…		…
1394	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1433	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1434	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1396	)	1435	)
1397	}	1436	}
1398		1437
1399	sub size_allocate {	1438	sub invoke_size_allocate {
1400	my ($self, $w, $h) = @_;	1439	my ($self, $w, $h) = @_;
1401		1440
1402	my $space = $self->{vertical} ? $h : $w;	1441	my $space = $self->{vertical} ? $h : $w;
1403	my $children = $self->{children};	1442	my $children = $self->{children};
1404		1443
…		…
1526		1565
1527	delete $self->{texture};	1566	delete $self->{texture};
1528	$self->SUPER::update;	1567	$self->SUPER::update;
1529	}	1568	}
1530		1569
		1570	sub realloc {
		1571	my ($self) = @_;
		1572
		1573	delete $self->{ox};
		1574	$self->SUPER::realloc;
		1575	}
		1576
1531	sub set_text {	1577	sub set_text {
1532	my ($self, $text) = @_;	1578	my ($self, $text) = @_;
1533		1579
1534	return if $self->{text} eq "T$text";	1580	return if $self->{text} eq "T$text";
1535	$self->{text} = "T$text";	1581	$self->{text} = "T$text";
1536		1582
1537	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1583	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538	$self->{layout}->set_text ($text);	1584	$self->{layout}->set_text ($text);
1539		1585
		1586	delete $self->{size_req};
1540	$self->realloc;	1587	$self->realloc;
1541	$self->update;	1588	$self->update;
1542	}	1589	}
1543		1590
1544	sub set_markup {	1591	sub set_markup {
…		…
1550	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1597	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551		1598
1552	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1599	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1553	$self->{layout}->set_markup ($markup);	1600	$self->{layout}->set_markup ($markup);
1554		1601
		1602	delete $self->{size_req};
1555	$self->realloc;	1603	$self->realloc;
1556	$self->update;	1604	$self->update;
1557	}	1605	}
1558		1606
1559	sub size_request {	1607	sub size_request {
1560	my ($self) = @_;	1608	my ($self) = @_;
1561		1609
		1610	$self->{size_req} ||= do {
1562	$self->{layout}->set_font ($self->{font}) if $self->{font};	1611	$self->{layout}->set_font ($self->{font}) if $self->{font};
1563	$self->{layout}->set_width ($self->{max_w} || -1);	1612	$self->{layout}->set_width ($self->{max_w} || -1);
1564	$self->{layout}->set_ellipsise ($self->{ellipsise});	1613	$self->{layout}->set_ellipsise ($self->{ellipsise});
1565	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1614	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1615	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567		1616
1568	my ($w, $h) = $self->{layout}->size;	1617	my ($w, $h) = $self->{layout}->size;
1569		1618
1570	if (exists $self->{template}) {	1619	if (exists $self->{template}) {
1571	$self->{template}->set_font ($self->{font}) if $self->{font};	1620	$self->{template}->set_font ($self->{font}) if $self->{font};
1572	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573		1622
1574	my ($w2, $h2) = $self->{template}->size;	1623	my ($w2, $h2) = $self->{template}->size;
1575		1624
1576	$w = List::Util::max $w, $w2;	1625	$w = List::Util::max $w, $w2;
1577	$h = List::Util::max $h, $h2;	1626	$h = List::Util::max $h, $h2;
		1627	}
		1628
		1629	[$w, $h]
1578	}	1630	};
1579		1631
1580	($w, $h)	1632	@{ $self->{size_req} }
1581	}	1633	}
1582		1634
1583	sub size_allocate {	1635	sub invoke_size_allocate {
1584	my ($self, $w, $h) = @_;	1636	my ($self, $w, $h) = @_;
1585		1637
1586	delete $self->{ox};	1638	delete $self->{ox};
1587		1639
1588	delete $self->{texture}	1640	delete $self->{texture}
1589	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1641	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1642
		1643	1
1590	}	1644	}
1591		1645
1592	sub set_fontsize {	1646	sub set_fontsize {
1593	my ($self, $fontsize) = @_;	1647	my ($self, $fontsize) = @_;
1594		1648
1595	$self->{fontsize} = $fontsize;	1649	$self->{fontsize} = $fontsize;
1596	delete $self->{texture};	1650	delete $self->{texture};
1597		1651
1598	$self->realloc;	1652	$self->realloc;
		1653	}
		1654
		1655	sub reconfigure {
		1656	my ($self) = @_;
		1657
		1658	delete $self->{size_req};
		1659
		1660	$self->SUPER::reconfigure;
1599	}	1661	}
1600		1662
1601	sub _draw {	1663	sub _draw {
1602	my ($self) = @_;	1664	my ($self) = @_;
1603		1665
…		…
1623	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1685	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1624	: ($self->{h} - $tex->{h}) * 0.5);	1686	: ($self->{h} - $tex->{h}) * 0.5);
1625	};	1687	};
1626		1688
1627	glEnable GL_TEXTURE_2D;	1689	glEnable GL_TEXTURE_2D;
1628	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1690
		1691	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1692	my $h = List::Util::min $self->{h} + 2, $tex->{h};
1629		1693
1630	if ($tex->{format} == GL_ALPHA) {	1694	if ($tex->{format} == GL_ALPHA) {
		1695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1631	glColor @{$self->{fg}};	1696	glColor @{$self->{fg}};
1632	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1697	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1633	} else {	1698	} else {
		1699	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1634	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1700	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1635	}	1701	}
1636		1702
1637	glDisable GL_TEXTURE_2D;	1703	glDisable GL_TEXTURE_2D;
1638	}	1704	}
1639		1705
…		…
1656	can_hover => 1,	1722	can_hover => 1,
1657	can_focus => 1,	1723	can_focus => 1,
1658	valign => 0,	1724	valign => 0,
1659	can_events => 1,	1725	can_events => 1,
1660	#text => ...	1726	#text => ...
		1727	#hidden => "*",
1661	@_	1728	@_
1662	)	1729	)
1663	}	1730	}
1664		1731
1665	sub _set_text {	1732	sub _set_text {
…		…
1667		1734
1668	delete $self->{cur_h};	1735	delete $self->{cur_h};
1669		1736
1670	return if $self->{text} eq $text;	1737	return if $self->{text} eq $text;
1671		1738
1672	delete $self->{texture};
1673
1674	$self->{last_activity} = $::NOW;	1739	$self->{last_activity} = $::NOW;
1675	$self->{text} = $text;	1740	$self->{text} = $text;
1676		1741
1677	$text =~ s/./*/g if $self->{hidden};	1742	$text =~ s/./*/g if $self->{hidden};
1678	$self->{layout}->set_text ("$text ");	1743	$self->{layout}->set_text ("$text ");
		1744	delete $self->{size_req};
1679		1745
1680	$self->_emit (changed => $self->{text});	1746	$self->emit (changed => $self->{text});
		1747
		1748	$self->realloc;
		1749	$self->update;
1681	}	1750	}
1682		1751
1683	sub set_text {	1752	sub set_text {
1684	my ($self, $text) = @_;	1753	my ($self, $text) = @_;
1685		1754
1686	$self->{cursor} = length $text;	1755	$self->{cursor} = length $text;
1687	$self->_set_text ($text);	1756	$self->_set_text ($text);
1688
1689	$self->realloc;
1690	}	1757	}
1691		1758
1692	sub get_text {	1759	sub get_text {
1693	$_[0]{text}	1760	$_[0]{text}
1694	}	1761	}
…		…
1699	my ($w, $h) = $self->SUPER::size_request;	1766	my ($w, $h) = $self->SUPER::size_request;
1700		1767
1701	($w + 1, $h) # add 1 for cursor	1768	($w + 1, $h) # add 1 for cursor
1702	}	1769	}
1703		1770
1704	sub key_down {	1771	sub invoke_key_down {
1705	my ($self, $ev) = @_;	1772	my ($self, $ev) = @_;
1706		1773
1707	my $mod = $ev->{mod};	1774	my $mod = $ev->{mod};
1708	my $sym = $ev->{sym};	1775	my $sym = $ev->{sym};
1709	my $uni = $ev->{unicode};	1776	my $uni = $ev->{unicode};
…		…
1721	} elsif ($sym == CFClient::SDLK_HOME) {	1788	} elsif ($sym == CFClient::SDLK_HOME) {
1722	$self->{cursor} = 0;	1789	$self->{cursor} = 0;
1723	} elsif ($sym == CFClient::SDLK_END) {	1790	} elsif ($sym == CFClient::SDLK_END) {
1724	$self->{cursor} = length $text;	1791	$self->{cursor} = length $text;
1725	} elsif ($uni == 27) {	1792	} elsif ($uni == 27) {
1726	$self->_emit ('escape');	1793	$self->emit ('escape');
1727	} elsif ($uni) {	1794	} elsif ($uni) {
1728	substr $text, $self->{cursor}++, 0, chr $uni;	1795	substr $text, $self->{cursor}++, 0, chr $uni;
1729	} else {	1796	} else {
1730	return 0;	1797	return 0;
1731	}	1798	}
…		…
1735	$self->realloc;	1802	$self->realloc;
1736		1803
1737	1	1804	1
1738	}	1805	}
1739		1806
1740	sub focus_in {	1807	sub invoke_focus_in {
1741	my ($self) = @_;	1808	my ($self) = @_;
1742		1809
1743	$self->{last_activity} = $::NOW;	1810	$self->{last_activity} = $::NOW;
1744		1811
1745	$self->SUPER::focus_in;	1812	$self->SUPER::invoke_focus_in
1746	}	1813	}
1747		1814
1748	sub button_down {	1815	sub invoke_button_down {
1749	my ($self, $ev, $x, $y) = @_;	1816	my ($self, $ev, $x, $y) = @_;
1750		1817
1751	$self->SUPER::button_down ($ev, $x, $y);	1818	$self->SUPER::invoke_button_down ($ev, $x, $y);
1752		1819
1753	my $idx = $self->{layout}->xy_to_index ($x, $y);	1820	my $idx = $self->{layout}->xy_to_index ($x, $y);
1754		1821
1755	# byte-index to char-index	1822	# byte-index to char-index
1756	my $text = $self->{text};	1823	my $text = $self->{text};
…		…
1761	$self->update;	1828	$self->update;
1762		1829
1763	1	1830	1
1764	}	1831	}
1765		1832
1766	sub mouse_motion {	1833	sub invoke_mouse_motion {
1767	my ($self, $ev, $x, $y) = @_;	1834	my ($self, $ev, $x, $y) = @_;
1768	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1835	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769		1836
1770	0	1837	1
1771	}	1838	}
1772		1839
1773	sub _draw {	1840	sub _draw {
1774	my ($self) = @_;	1841	my ($self) = @_;
1775		1842
1776	local $self->{fg} = $self->{fg};	1843	local $self->{fg} = $self->{fg};
1777		1844
1778	if ($FOCUS == $self) {	1845	if ($FOCUS == $self) {
1779	glColor @{$self->{active_bg}};	1846	glColor_premultiply @{$self->{active_bg}};
1780	$self->{fg} = $self->{active_fg};	1847	$self->{fg} = $self->{active_fg};
1781	} else {	1848	} else {
1782	glColor @{$self->{bg}};	1849	glColor_premultiply @{$self->{bg}};
1783	}	1850	}
1784		1851
1785	glEnable GL_BLEND;	1852	glEnable GL_BLEND;
1786	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1853	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787	glBegin GL_QUADS;	1854	glBegin GL_QUADS;
1788	glVertex 0 , 0;	1855	glVertex 0 , 0;
1789	glVertex 0 , $self->{h};	1856	glVertex 0 , $self->{h};
1790	glVertex $self->{w}, $self->{h};	1857	glVertex $self->{w}, $self->{h};
1791	glVertex $self->{w}, 0;	1858	glVertex $self->{w}, 0;
…		…
1816		1883
1817	our @ISA = CFClient::UI::EntryBase::;	1884	our @ISA = CFClient::UI::EntryBase::;
1818		1885
1819	use CFClient::OpenGL;	1886	use CFClient::OpenGL;
1820		1887
1821	sub key_down {	1888	sub invoke_key_down {
1822	my ($self, $ev) = @_;	1889	my ($self, $ev) = @_;
1823		1890
1824	my $sym = $ev->{sym};	1891	my $sym = $ev->{sym};
1825		1892
1826	if ($sym == 13) {	1893	if ($sym == 13) {
1827	unshift @{$self->{history}},	1894	unshift @{$self->{history}},
1828	my $txt = $self->get_text;	1895	my $txt = $self->get_text;
1829	$self->{history_pointer} = -1;	1896	$self->{history_pointer} = -1;
1830	$self->{history_saveback} = '';	1897	$self->{history_saveback} = '';
1831	$self->_emit (activate => $txt);	1898	$self->emit (activate => $txt);
1832	$self->update;	1899	$self->update;
1833		1900
1834	} elsif ($sym == CFClient::SDLK_UP) {	1901	} elsif ($sym == CFClient::SDLK_UP) {
1835	if ($self->{history_pointer} < 0) {	1902	if ($self->{history_pointer} < 0) {
1836	$self->{history_saveback} = $self->get_text;	1903	$self->{history_saveback} = $self->get_text;
…		…
1852	} else {	1919	} else {
1853	$self->set_text ($self->{history_saveback});	1920	$self->set_text ($self->{history_saveback});
1854	}	1921	}
1855		1922
1856	} else {	1923	} else {
1857	return $self->SUPER::key_down ($ev)	1924	return $self->SUPER::invoke_key_down ($ev)
1858	}	1925	}
1859		1926
1860	1	1927	1
1861	}	1928	}
1862		1929
…		…
1886	can_events => 1,	1953	can_events => 1,
1887	@_	1954	@_
1888	)	1955	)
1889	}	1956	}
1890		1957
1891	sub activate { }
1892
1893	sub button_up {	1958	sub invoke_button_up {
1894	my ($self, $ev, $x, $y) = @_;	1959	my ($self, $ev, $x, $y) = @_;
1895		1960
1896	$self->emit ("activate")	1961	$self->emit ("activate")
1897	if $x >= 0 && $x < $self->{w}	1962	if $x >= 0 && $x < $self->{w}
1898	&& $y >= 0 && $y < $self->{h};	1963	&& $y >= 0 && $y < $self->{h};
…		…
1901	}	1966	}
1902		1967
1903	sub _draw {	1968	sub _draw {
1904	my ($self) = @_;	1969	my ($self) = @_;
1905		1970
1906	local $self->{fg} = $self->{fg};	1971	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908	if ($GRAB == $self) {
1909	$self->{fg} = $self->{active_fg};
1910	}
1911		1972
1912	glEnable GL_TEXTURE_2D;	1973	glEnable GL_TEXTURE_2D;
1913	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1974	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914	glColor 0, 0, 0, 1;	1975	glColor 0, 0, 0, 1;
1915		1976
1916	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1977	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1917		1978
1918	glDisable GL_TEXTURE_2D;	1979	glDisable GL_TEXTURE_2D;
1919		1980
1920	$self->SUPER::_draw;	1981	$self->SUPER::_draw;
		1982	}
		1983
		1984	#############################################################################
		1985
		1986	package CFClient::UI::ImageButton;
		1987
		1988	our @ISA = CFClient::UI::Image::;
		1989
		1990	use CFClient::OpenGL;
		1991
		1992	my %textures;
		1993
		1994	sub new {
		1995	my $class = shift;
		1996
		1997	my $self = $class->SUPER::new (
		1998	padding_x => 4,
		1999	padding_y => 4,
		2000	fg => [1, 1, 1],
		2001	active_fg => [0, 0, 1],
		2002	can_hover => 1,
		2003	align => 0,
		2004	valign => 0,
		2005	can_events => 1,
		2006	@_
		2007	);
		2008	}
		2009
		2010	sub invoke_button_up {
		2011	my ($self, $ev, $x, $y) = @_;
		2012
		2013	$self->emit ("activate")
		2014	if $x >= 0 && $x < $self->{w}
		2015	&& $y >= 0 && $y < $self->{h};
		2016
		2017	1
1921	}	2018	}
1922		2019
1923	#############################################################################	2020	#############################################################################
1924		2021
1925	package CFClient::UI::CheckBox;	2022	package CFClient::UI::CheckBox;
…		…
1952	my ($self) = @_;	2049	my ($self) = @_;
1953		2050
1954	(6) x 2	2051	(6) x 2
1955	}	2052	}
1956		2053
1957	sub button_down {	2054	sub invoke_button_down {
1958	my ($self, $ev, $x, $y) = @_;	2055	my ($self, $ev, $x, $y) = @_;
1959		2056
1960	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2057	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1961	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2058	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1962	$self->{state} = !$self->{state};	2059	$self->{state} = !$self->{state};
1963	$self->_emit (changed => $self->{state});	2060	$self->emit (changed => $self->{state});
1964	} else {	2061	} else {
1965	return 0	2062	return 0
1966	}	2063	}
1967		2064
1968	1	2065	1
…		…
2140		2237
2141	my $h1 = $self->{h} * (1 - $ycut1);	2238	my $h1 = $self->{h} * (1 - $ycut1);
2142	my $h2 = $self->{h} * (1 - $ycut2);	2239	my $h2 = $self->{h} * (1 - $ycut2);
2143		2240
2144	glEnable GL_BLEND;	2241	glEnable GL_BLEND;
2145	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2242	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2243	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2146	glEnable GL_TEXTURE_2D;	2244	glEnable GL_TEXTURE_2D;
2147	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2245	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148		2246
2149	glBindTexture GL_TEXTURE_2D, $t1->{name};	2247	glBindTexture GL_TEXTURE_2D, $t1->{name};
2150	glBegin GL_QUADS;	2248	glBegin GL_QUADS;
…		…
2264	$self->update;	2362	$self->update;
2265		2363
2266	$self	2364	$self
2267	}	2365	}
2268		2366
2269	sub changed { }
2270
2271	sub set_range {	2367	sub set_range {
2272	my ($self, $range) = @_;	2368	my ($self, $range) = @_;
2273		2369
2274	($range, $self->{range}) = ($self->{range}, $range);	2370	($range, $self->{range}) = ($self->{range}, $range);
2275		2371
2276	$self->update
2277	if "@$range" ne "@{$self->{range}}";	2372	if ("@$range" ne "@{$self->{range}}") {
		2373	$self->update;
		2374	$self->set_value ($self->{range}[0]);
		2375	}
2278	}	2376	}
2279		2377
2280	sub set_value {	2378	sub set_value {
2281	my ($self, $value) = @_;	2379	my ($self, $value) = @_;
2282		2380
…		…
2293	if $unit;	2391	if $unit;
2294		2392
2295	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2393	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2296		2394
2297	if ($value != $old_value) {	2395	if ($value != $old_value) {
2298	$self->_emit (changed => $value);	2396	$self->emit (changed => $value);
2299	$self->update;	2397	$self->update;
2300	}	2398	}
2301	}	2399	}
2302		2400
2303	sub size_request {	2401	sub size_request {
2304	my ($self) = @_;	2402	my ($self) = @_;
2305		2403
2306	($self->{req_w}, $self->{req_h})	2404	($self->{req_w}, $self->{req_h})
2307	}	2405	}
2308		2406
2309	sub button_down {	2407	sub invoke_button_down {
2310	my ($self, $ev, $x, $y) = @_;	2408	my ($self, $ev, $x, $y) = @_;
2311		2409
2312	$self->SUPER::button_down ($ev, $x, $y);	2410	$self->SUPER::invoke_button_down ($ev, $x, $y);
2313		2411
2314	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2412	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315		2413
2316	$self->mouse_motion ($ev, $x, $y)	2414	$self->mouse_motion ($ev, $x, $y)
2317	}	2415	}
2318		2416
2319	sub mouse_motion {	2417	sub invoke_mouse_motion {
2320	my ($self, $ev, $x, $y) = @_;	2418	my ($self, $ev, $x, $y) = @_;
2321		2419
2322	if ($GRAB == $self) {	2420	if ($GRAB == $self) {
2323	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2421	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2324		2422
…		…
2335	}	2433	}
2336		2434
2337	sub update {	2435	sub update {
2338	my ($self) = @_;	2436	my ($self) = @_;
2339		2437
2340	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2438	delete $self->{knob_w};
		2439	$self->SUPER::update;
		2440	}
		2441
		2442	sub _draw {
		2443	my ($self) = @_;
		2444
		2445	unless ($self->{knob_w}) {
2341	$self->set_value ($self->{range}[0]);	2446	$self->set_value ($self->{range}[0]);
2342		2447
2343	my ($value, $lo, $hi, $page) = @{$self->{range}};	2448	my ($value, $lo, $hi, $page) = @{$self->{range}};
2344	my $range = ($hi - $page - $lo) || 1e-100;	2449	my $range = ($hi - $page - $lo) || 1e-100;
2345		2450
…		…
2351	$value = ($value - $lo) / $range;	2456	$value = ($value - $lo) / $range;
2352	$value = $value * $self->{scale} + $self->{offset};	2457	$value = $value * $self->{scale} + $self->{offset};
2353		2458
2354	$self->{knob_x} = $value - $knob_w * 0.5;	2459	$self->{knob_x} = $value - $knob_w * 0.5;
2355	$self->{knob_w} = $knob_w;	2460	$self->{knob_w} = $knob_w;
2356	});	2461	}
2357
2358	$self->SUPER::update;
2359	}
2360
2361	sub _draw {
2362	my ($self) = @_;
2363		2462
2364	$self->SUPER::_draw ();	2463	$self->SUPER::_draw ();
2365		2464
2366	glScale $self->{w}, $self->{h};	2465	glScale $self->{w}, $self->{h};
2367		2466
…		…
2428	sub set_range { shift->{slider}->set_range (@_) }	2527	sub set_range { shift->{slider}->set_range (@_) }
2429	sub set_value { shift->{slider}->set_value (@_) }	2528	sub set_value { shift->{slider}->set_value (@_) }
2430		2529
2431	#############################################################################	2530	#############################################################################
2432		2531
2433	package CFClient::UI::TextView;	2532	package CFClient::UI::TextScroller;
2434		2533
2435	our @ISA = CFClient::UI::HBox::;	2534	our @ISA = CFClient::UI::HBox::;
2436		2535
2437	use CFClient::OpenGL;	2536	use CFClient::OpenGL;
2438		2537
…		…
2440	my $class = shift;	2539	my $class = shift;
2441		2540
2442	my $self = $class->SUPER::new (	2541	my $self = $class->SUPER::new (
2443	fontsize => 1,	2542	fontsize => 1,
2444	can_events => 0,	2543	can_events => 0,
		2544	indent => 0,
2445	#font => default_font	2545	#font => default_font
2446	@_,	2546	@_,
2447		2547
2448	layout => (new CFClient::Layout 1),	2548	layout => (new CFClient::Layout 1),
2449	par => [],	2549	par => [],
…		…
2464		2564
2465	$self->{fontsize} = $fontsize;	2565	$self->{fontsize} = $fontsize;
2466	$self->reflow;	2566	$self->reflow;
2467	}	2567	}
2468		2568
2469	sub size_allocate {	2569	sub invoke_size_allocate {
2470	my ($self, $w, $h) = @_;	2570	my ($self, $w, $h) = @_;
2471
2472	$self->SUPER::size_allocate ($w, $h);
2473		2571
2474	$self->{layout}->set_font ($self->{font}) if $self->{font};	2572	$self->{layout}->set_font ($self->{font}) if $self->{font};
2475	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2573	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476	$self->{layout}->set_width ($self->{children}[0]{w});	2574	$self->{layout}->set_width ($self->{children}[0]{w});
		2575	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2477		2576
2478	$self->reflow;	2577	$self->reflow;
		2578
		2579	$self->SUPER::invoke_size_allocate ($w, $h)
2479	}	2580	}
2480		2581
2481	sub text_size {	2582	sub text_size {
2482	my ($self, $text, $indent) = @_;	2583	my ($self, $text, $indent) = @_;
2483		2584
2484	my $layout = $self->{layout};	2585	my $layout = $self->{layout};
2485		2586
2486	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2587	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487	$layout->set_width ($self->{children}[0]{w} - $indent);	2588	$layout->set_width ($self->{children}[0]{w} - $indent);
		2589	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488	$layout->set_markup ($text);	2590	$layout->set_markup ($text);
2489		2591
2490	$layout->size	2592	$layout->size
2491	}	2593	}
2492		2594
…		…
2531		2633
2532	return unless $self->{h} > 0;	2634	return unless $self->{h} > 0;
2533		2635
2534	delete $self->{texture};	2636	delete $self->{texture};
2535		2637
2536	$ROOT->on_post_alloc ($self, sub {	2638	$ROOT->on_post_alloc ($self => sub {
2537	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2639	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538		2640
2539	if (delete $self->{need_reflow}) {	2641	if (delete $self->{need_reflow}) {
2540	my $height = 0;	2642	my $height = 0;
2541		2643
…		…
2544	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2646	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545		2647
2546	for (@{$self->{par}}) {	2648	for (@{$self->{par}}) {
2547	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2649	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2548	$layout->set_width ($W - $_->[3]);	2650	$layout->set_width ($W - $_->[3]);
		2651	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2549	$layout->set_markup ($_->[4]);	2652	$layout->set_markup ($_->[4]);
2550	my ($w, $h) = $layout->size;	2653	my ($w, $h) = $layout->size;
2551	$_->[0] = $w + $_->[3];	2654	$_->[0] = $w + $_->[3];
2552	$_->[1] = $h;	2655	$_->[1] = $h;
2553	}	2656	}
…		…
2556	}	2659	}
2557		2660
2558	$self->{height} = $height;	2661	$self->{height} = $height;
2559		2662
2560	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2663	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2561		2664
2562	delete $self->{texture};	2665	delete $self->{texture};
2563	}	2666	}
2564		2667
2565	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2668	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2566	glClearColor 0.5, 0.5, 0.5, 0;	2669	glClearColor 0, 0, 0, 0;
2567	glClear GL_COLOR_BUFFER_BIT;	2670	glClear GL_COLOR_BUFFER_BIT;
2568		2671
2569	my $top = int $self->{children}[1]{range}[0];	2672	my $top = int $self->{children}[1]{range}[0];
2570		2673
2571	my $y0 = $top;	2674	my $y0 = $top;
…		…
2585	my $h = $par->[1];	2688	my $h = $par->[1];
2586		2689
2587	if ($y0 < $y + $h && $y < $y1) {	2690	if ($y0 < $y + $h && $y < $y1) {
2588	$layout->set_foreground (@{ $par->[2] });	2691	$layout->set_foreground (@{ $par->[2] });
2589	$layout->set_width ($W - $par->[3]);	2692	$layout->set_width ($W - $par->[3]);
		2693	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590	$layout->set_markup ($par->[4]);	2694	$layout->set_markup ($par->[4]);
2591		2695
2592	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2696	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2593		2697
2594	glRasterPos $par->[3], $y - $y0;	2698	glRasterPos $par->[3], $y - $y0;
…		…
2606	sub _draw {	2710	sub _draw {
2607	my ($self) = @_;	2711	my ($self) = @_;
2608		2712
2609	glEnable GL_TEXTURE_2D;	2713	glEnable GL_TEXTURE_2D;
2610	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2714	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611	glColor 1, 1, 1, 1;	2715	glColor 0, 0, 0, 1;
2612	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2716	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2613	glDisable GL_TEXTURE_2D;	2717	glDisable GL_TEXTURE_2D;
2614		2718
2615	$self->{children}[1]->draw;	2719	$self->{children}[1]->draw;
2616		2720
2617	}	2721	}
…		…
2708	$tooltip .= "\n\n" . (ref $widget) . "\n"	2812	$tooltip .= "\n\n" . (ref $widget) . "\n"
2709	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2813	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710	. "req $widget->{req_w} $widget->{req_h}\n"	2814	. "req $widget->{req_w} $widget->{req_h}\n"
2711	. "visible $widget->{visible}";	2815	. "visible $widget->{visible}";
2712	}	2816	}
		2817
		2818	$tooltip =~ s/^\n+//;
		2819	$tooltip =~ s/\n+$//;
2713		2820
2714	$self->add (new CFClient::UI::Label	2821	$self->add (new CFClient::UI::Label
2715	markup => $tooltip,	2822	markup => $tooltip,
2716	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2823	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2717	fontsize => 0.8,	2824	fontsize => 0.8,
…		…
2727	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2834	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2728		2835
2729	($w + 4, $h + 4)	2836	($w + 4, $h + 4)
2730	}	2837	}
2731		2838
2732	sub size_allocate {	2839	sub invoke_size_allocate {
2733	my ($self, $w, $h) = @_;	2840	my ($self, $w, $h) = @_;
2734		2841
2735	$self->SUPER::size_allocate ($w - 4, $h - 4);	2842	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2736	}	2843	}
2737		2844
2738	sub visibility_change {	2845	sub invoke_visibility_change {
2739	my ($self, $visible) = @_;	2846	my ($self, $visible) = @_;
2740		2847
2741	return unless $visible;	2848	return unless $visible;
2742		2849
2743	$self->{root}->on_post_alloc ("move_$self" => sub {	2850	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2745	or return;	2852	or return;
2746		2853
2747	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2854	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748		2855
2749	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2856	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750	if $x + $self->{w} > $::WIDTH;	2857	if $x + $self->{w} > $self->{root}{w};
2751		2858
2752	$self->move_abs ($x, $y);	2859	$self->move_abs ($x, $y);
2753	});	2860	});
2754	}	2861	}
2755		2862
…		…
2844	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2951	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845		2952
2846	if ($tex) {	2953	if ($tex) {
2847	glEnable GL_TEXTURE_2D;	2954	glEnable GL_TEXTURE_2D;
2848	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849	glColor 1, 1, 1, 1;	2956	glColor 0, 0, 0, 1;
2850	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2957	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851	glDisable GL_TEXTURE_2D;	2958	glDisable GL_TEXTURE_2D;
2852	}	2959	}
2853	}	2960	}
2854		2961
2855	sub DESTROY {	2962	sub destroy {
2856	my ($self) = @_;	2963	my ($self) = @_;
2857		2964
2858	$self->{timer}->cancel	2965	$self->{timer}->cancel
2859	if $self->{timer};	2966	if $self->{timer};
2860		2967
2861	$self->SUPER::DESTROY;	2968	$self->SUPER::destroy;
2862	}	2969	}
2863		2970
2864	#############################################################################	2971	#############################################################################
2865		2972
2866	package CFClient::UI::Buttonbar;	2973	package CFClient::UI::Buttonbar;
…		…
2887	);	2994	);
2888		2995
2889	$self->add ($self->{vbox} = new CFClient::UI::VBox);	2996	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2890		2997
2891	for my $item (@{ $self->{items} }) {	2998	for my $item (@{ $self->{items} }) {
2892	my ($widget, $cb) = @$item;	2999	my ($widget, $cb, $tooltip) = @$item;
2893		3000
2894	# handle various types of items, only text for now	3001	# handle various types of items, only text for now
2895	if (!ref $widget) {	3002	if (!ref $widget) {
2896	$widget = new CFClient::UI::Label	3003	$widget = new CFClient::UI::Label
2897	can_hover => 1,	3004	can_hover => 1,
2898	can_events => 1,	3005	can_events => 1,
2899	text => $widget;	3006	markup => $widget,
		3007	tooltip => $tooltip
2900	}	3008	}
2901		3009
2902	$self->{item}{$widget} = $item;	3010	$self->{item}{$widget} = $item;
2903		3011
2904	$self->{vbox}->add ($widget);	3012	$self->{vbox}->add ($widget);
…		…
2909		3017
2910	# popup given the event (must be a mouse button down event currently)	3018	# popup given the event (must be a mouse button down event currently)
2911	sub popup {	3019	sub popup {
2912	my ($self, $ev) = @_;	3020	my ($self, $ev) = @_;
2913		3021
2914	$self->_emit ("popdown");	3022	$self->emit ("popdown");
2915		3023
2916	# maybe save $GRAB? must be careful about events...	3024	# maybe save $GRAB? must be careful about events...
2917	$GRAB = $self;	3025	$GRAB = $self;
2918	$self->{button} = $ev->{button};	3026	$self->{button} = $ev->{button};
2919		3027
2920	$self->show;	3028	$self->show;
2921	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3029	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2922	}	3030	}
2923		3031
2924	sub mouse_motion {	3032	sub invoke_mouse_motion {
2925	my ($self, $ev, $x, $y) = @_;	3033	my ($self, $ev, $x, $y) = @_;
2926		3034
2927	# TODO: should use vbox->find_widget or so	3035	# TODO: should use vbox->find_widget or so
2928	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3036	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2929	$self->{hover} = $self->{item}{$HOVER};	3037	$self->{hover} = $self->{item}{$HOVER};
2930		3038
2931	0	3039	0
2932	}	3040	}
2933		3041
2934	sub button_up {	3042	sub invoke_button_up {
2935	my ($self, $ev, $x, $y) = @_;	3043	my ($self, $ev, $x, $y) = @_;
2936		3044
2937	if ($ev->{button} == $self->{button}) {	3045	if ($ev->{button} == $self->{button}) {
2938	undef $GRAB;	3046	undef $GRAB;
2939	$self->hide;	3047	$self->hide;
2940		3048
2941	$self->_emit ("popdown");	3049	$self->emit ("popdown");
2942	$self->{hover}[1]->() if $self->{hover};	3050	$self->{hover}[1]->() if $self->{hover};
2943	} else {	3051	} else {
2944	return 0	3052	return 0
2945	}	3053	}
2946		3054
…		…
2983	: $self->{children}[$page_or_widget];	3091	: $self->{children}[$page_or_widget];
2984		3092
2985	$self->{current} = $widget;	3093	$self->{current} = $widget;
2986	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3094	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987		3095
2988	$self->_emit (page_changed => $self->{current});	3096	$self->emit (page_changed => $self->{current});
2989		3097
2990	$self->realloc;	3098	$self->realloc;
2991	}	3099	}
2992		3100
2993	sub visible_children {	3101	sub visible_children {
…		…
2998	my ($self) = @_;	3106	my ($self) = @_;
2999		3107
3000	$self->{current}->size_request	3108	$self->{current}->size_request
3001	}	3109	}
3002		3110
3003	sub size_allocate {	3111	sub invoke_size_allocate {
3004	my ($self, $w, $h) = @_;	3112	my ($self, $w, $h) = @_;
3005		3113
3006	$self->{current}->configure (0, 0, $w, $h);	3114	$self->{current}->configure (0, 0, $w, $h);
		3115
		3116	1
3007	}	3117	}
3008		3118
3009	sub _draw {	3119	sub _draw {
3010	my ($self) = @_;	3120	my ($self) = @_;
3011		3121
…		…
3022	my $class = shift;	3132	my $class = shift;
3023		3133
3024	my $self = $class->SUPER::new (	3134	my $self = $class->SUPER::new (
3025	buttonbar => (new CFClient::UI::Buttonbar),	3135	buttonbar => (new CFClient::UI::Buttonbar),
3026	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3136	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3137	# filter => # will be put between multiplexer and $self
3027	@_,	3138	@_,
3028	);	3139	);
3029		3140
		3141	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030	$self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});	3142	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031		3143
3032	$self	3144	$self
3033	}	3145	}
3034		3146
3035	sub add {	3147	sub add {
…		…
3048		3160
3049	sub set_current_page {	3161	sub set_current_page {
3050	my ($self, $page) = @_;	3162	my ($self, $page) = @_;
3051		3163
3052	$self->{multiplexer}->set_current_page ($page);	3164	$self->{multiplexer}->set_current_page ($page);
3053	$self->_emit (page_changed => $self->{multiplexer}{current});	3165	$self->emit (page_changed => $self->{multiplexer}{current});
3054	}	3166	}
3055		3167
3056	#############################################################################	3168	#############################################################################
3057		3169
3058	package CFClient::UI::Statusbox;	3170	package CFClient::UI::Combobox;
3059		3171
		3172	use utf8;
		3173
3060	our @ISA = CFClient::UI::VBox::;	3174	our @ISA = CFClient::UI::Button::;
3061		3175
3062	sub new {	3176	sub new {
3063	my $class = shift;	3177	my $class = shift;
3064		3178
3065	$class->SUPER::new (	3179	my $self = $class->SUPER::new (
		3180	options => [], # [value, title, longdesc], ...
		3181	value => undef,
		3182	@_,
		3183	);
		3184
		3185	$self->_set_value ($self->{value});
		3186
		3187	$self
		3188	}
		3189
		3190	sub invoke_button_down {
		3191	my ($self, $ev) = @_;
		3192
		3193	my @menu_items;
		3194
		3195	for (@{ $self->{options} }) {
		3196	my ($value, $title, $tooltip) = @$_;
		3197
		3198	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3199	}
		3200
		3201	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3202	}
		3203
		3204	sub _set_value {
		3205	my ($self, $value) = @_;
		3206
		3207	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3208	or return;
		3209
		3210	$self->{value} = $item->[0];
		3211	$self->set_markup ("$item->[1] ⇓");
		3212	$self->set_tooltip ($item->[2]);
		3213	}
		3214
		3215	sub set_value {
		3216	my ($self, $value) = @_;
		3217
		3218	return unless $self->{value} ne $value;
		3219
		3220	$self->_set_value ($value);
		3221	$self->emit (changed => $value);
		3222	}
		3223
		3224	#############################################################################
		3225
		3226	package CFClient::UI::Statusbox;
		3227
		3228	our @ISA = CFClient::UI::VBox::;
		3229
		3230	sub new {
		3231	my $class = shift;
		3232
		3233	my $self = $class->SUPER::new (
3066	fontsize => 0.8,	3234	fontsize => 0.8,
3067	@_,	3235	@_,
3068	)	3236	);
		3237
		3238	Scalar::Util::weaken (my $this = $self);
		3239
		3240	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3241
		3242	$self
3069	}	3243	}
3070		3244
3071	sub reorder {	3245	sub reorder {
3072	my ($self) = @_;	3246	my ($self) = @_;
3073	my $NOW = time;	3247	my $NOW = Time::HiRes::time;
		3248
		3249	# freeze display when hovering over any label
		3250	return if $CFClient::UI::TOOLTIP->{owner}
		3251	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3252	values %{ $self->{item} };
3074		3253
3075	while (my ($k, $v) = each %{ $self->{item} }) {	3254	while (my ($k, $v) = each %{ $self->{item} }) {
3076	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3255	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077	}	3256	}
3078		3257
…		…
3081	my @items = sort {	3260	my @items = sort {
3082	$a->{pri} <=> $b->{pri}	3261	$a->{pri} <=> $b->{pri}
3083	or $b->{id} <=> $a->{id}	3262	or $b->{id} <=> $a->{id}
3084	} values %{ $self->{item} };	3263	} values %{ $self->{item} };
3085		3264
		3265	$self->{timer}->interval (1);
		3266
3086	my $count = 10 + 1;	3267	my $count = 10 + 1;
3087	for my $item (@items) {	3268	for my $item (@items) {
3088	last unless --$count;	3269	last unless --$count;
3089		3270
3090	push @widgets, $item->{label} ||= do {	3271	my $label = $item->{label} ||= do {
3091	# TODO: doesn't handle markup well (read as: at all)	3272	# TODO: doesn't handle markup well (read as: at all)
3092	my $short = $item->{count} > 1	3273	my $short = $item->{count} > 1
3093	? "<b>$item->{count} ×</b> $item->{text}"	3274	? "<b>$item->{count} ×</b> $item->{text}"
3094	: $item->{text};	3275	: $item->{text};
3095		3276
…		…
3103	tooltip => $item->{tooltip},	3284	tooltip => $item->{tooltip},
3104	tooltip_font => $::FONT_PROP,	3285	tooltip_font => $::FONT_PROP,
3105	tooltip_width => 0.67,	3286	tooltip_width => 0.67,
3106	fontsize => $item->{fontsize} || $self->{fontsize},	3287	fontsize => $item->{fontsize} || $self->{fontsize},
3107	max_w => $::WIDTH * 0.44,	3288	max_w => $::WIDTH * 0.44,
3108	fg => $item->{fg},	3289	fg => [@{ $item->{fg} }],
3109	can_events => 1,	3290	can_events => 1,
3110	can_hover => 1	3291	can_hover => 1
3111	};	3292	};
		3293
		3294	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3295	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3296	$label->update;
		3297	$label->set_max_size (undef, $label->{req_h} * $diff)
		3298	if $diff < 1;
		3299	$self->{timer}->interval (1/30);
		3300	} else {
		3301	$label->{fg}[3] = $item->{fg}[3] || 1;
		3302	}
		3303
		3304	push @widgets, $label;
3112	}	3305	}
3113		3306
3114	$self->clear;	3307	$self->clear;
3115	$self->SUPER::add (reverse @widgets);	3308	$self->SUPER::add (reverse @widgets);
3116	}	3309	}
…		…
3121	$text =~ s/^\s+//;	3314	$text =~ s/^\s+//;
3122	$text =~ s/\s+$//;	3315	$text =~ s/\s+$//;
3123		3316
3124	return unless $text;	3317	return unless $text;
3125		3318
3126	my $timeout = time + ((delete $arg{timeout}) || 60);	3319	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127		3320
3128	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3321	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129		3322
3130	if (my $item = $self->{item}{$group}) {	3323	if (my $item = $self->{item}{$group}) {
3131	if ($item->{text} eq $text) {	3324	if ($item->{text} eq $text) {
3132	$item->{count}++;	3325	$item->{count}++;
3133	} else {	3326	} else {
3134	$item->{count} = 1;	3327	$item->{count} = 1;
3135	$item->{text} = $item->{tooltip} = $text;	3328	$item->{text} = $item->{tooltip} = $text;
3136	}	3329	}
3137	$item->{id} = ++$self->{id};	3330	$item->{id} += 0.2;#d#
3138	$item->{timeout} = $timeout;	3331	$item->{timeout} = $timeout;
3139	delete $item->{label};	3332	delete $item->{label};
3140	} else {	3333	} else {
3141	$self->{item}{$group} = {	3334	$self->{item}{$group} = {
3142	id => ++$self->{id},	3335	id => ++$self->{id},
…		…
3161		3354
3162	$self->reorder;	3355	$self->reorder;
3163	$self->SUPER::reconfigure;	3356	$self->SUPER::reconfigure;
3164	}	3357	}
3165		3358
		3359	sub destroy {
		3360	my ($self) = @_;
		3361
		3362	$self->{timer}->cancel;
		3363
		3364	$self->SUPER::destroy;
		3365	}
		3366
3166	#############################################################################	3367	#############################################################################
3167		3368
3168	package CFClient::UI::Inventory;	3369	package CFClient::UI::Inventory;
3169		3370
3170	our @ISA = CFClient::UI::ScrolledWindow::;	3371	our @ISA = CFClient::UI::ScrolledWindow::;
3171		3372
3172	sub new {	3373	sub new {
3173	my $class = shift;	3374	my $class = shift;
3174		3375
3175	my $self = $class->SUPER::new (	3376	my $self = $class->SUPER::new (
3176	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3377	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177	@_,	3378	@_,
3178	);	3379	);
3179		3380
3180	$self	3381	$self
3181	}	3382	}
3182		3383
3183	sub set_items {	3384	sub set_items {
3184	my ($self, $items) = @_;	3385	my ($self, $items) = @_;
3185		3386
3186	$self->{scrolled}->clear;	3387	$self->{child}->clear;
3187	return unless $items;	3388	return unless $items;
3188		3389
3189	my @items = sort {	3390	my @items = sort {
3190	($a->{type} <=> $b->{type})	3391	($a->{type} <=> $b->{type})
3191	or ($a->{name} cmp $b->{name})	3392	or ($a->{name} cmp $b->{name})
…		…
3195		3396
3196	my $row = 0;	3397	my $row = 0;
3197	for my $item (@items) {	3398	for my $item (@items) {
3198	CFClient::Item::update_widgets $item;	3399	CFClient::Item::update_widgets $item;
3199		3400
3200	$self->{scrolled}->add (0, $row, $item->{face_widget});	3401	$self->{child}->add (0, $row, $item->{face_widget});
3201	$self->{scrolled}->add (1, $row, $item->{desc_widget});	3402	$self->{child}->add (1, $row, $item->{desc_widget});
3202	$self->{scrolled}->add (2, $row, $item->{weight_widget});	3403	$self->{child}->add (2, $row, $item->{weight_widget});
3203		3404
3204	$row++;	3405	$row++;
3205	}	3406	}
3206	}	3407	}
3207		3408
…		…
3312	my ($self) = @_;	3513	my ($self) = @_;
3313	$self->ask_for_bind (1);	3514	$self->ask_for_bind (1);
3314	}	3515	}
3315		3516
3316	sub ask_for_bind {	3517	sub ask_for_bind {
3317	my ($self, $commit) = @_;	3518	my ($self, $commit, $end_cb) = @_;
3318		3519
3319	CFClient::Binder::open_binding_dialog (sub {	3520	CFClient::Binder::open_binding_dialog (sub {
3320	my ($mod, $sym) = @_;	3521	my ($mod, $sym) = @_;
3321	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?	3522	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322	$self->update_binding_widgets;	3523	$self->update_binding_widgets;
3323	$self->commit if $commit;	3524	$self->commit if $commit;
		3525	$end_cb->() if $end_cb;
3324	});	3526	});
3325	}	3527	}
3326		3528
3327	# $mod and $sym are the modifiers and key symbol	3529	# $mod and $sym are the modifiers and key symbol
3328	# $cmds is a array ref of strings (the commands)	3530	# $cmds is a array ref of strings (the commands)
…		…
3346	}	3548	}
3347		3549
3348	# this is a shortcut method that asks for a binding	3550	# this is a shortcut method that asks for a binding
3349	# and then just binds it.	3551	# and then just binds it.
3350	sub do_quick_binding {	3552	sub do_quick_binding {
3351	my ($self, $cmds) = @_;	3553	my ($self, $cmds, $end_cb) = @_;
3352	$self->set_binding (undef, undef, $cmds, sub {	3554	$self->set_binding (undef, undef, $cmds, sub {
3353	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];	3555	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354	});	3556	});
3355	$self->ask_for_bind (1);	3557	$self->ask_for_bind (1, $end_cb);
3356	}	3558	}
3357		3559
3358	sub update_binding_widgets {	3560	sub update_binding_widgets {
3359	my ($self) = @_;	3561	my ($self) = @_;
3360	my ($mod, $sym, $cmds) = $self->get_binding;	3562	my ($mod, $sym, $cmds) = $self->get_binding;
…		…
3404		3606
3405	#############################################################################	3607	#############################################################################
3406		3608
3407	package CFClient::UI::SpellList;	3609	package CFClient::UI::SpellList;
3408		3610
3409	our @ISA = CFClient::UI::ScrolledWindow::;	3611	our @ISA = CFClient::UI::Table::;
3410		3612
3411	sub new {	3613	sub new {
3412	my $class = shift;	3614	my $class = shift;
3413		3615
3414	my $self = $class->SUPER::new (	3616	my $self = $class->SUPER::new (
3415	binding => [],	3617	binding => [],
3416	commands => [],	3618	commands => [],
3417	scrolled => (new CFClient::UI::Table),
3418	@_,	3619	@_,
3419	)	3620	)
3420	}	3621	}
3421		3622
3422	# XXX: Do sorting? Argl...	3623	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3624
		3625	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3626	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3627	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3628	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
		3629	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3630	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3631	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3632	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3633	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3634	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3635
		3636	sub rebuild_spell_list {
		3637	my ($self) = @_;
		3638
		3639	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3640	$self->clear;
		3641
		3642	return unless $::CONN;
		3643
		3644	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3645	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
		3646	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3647	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3648	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3649
		3650	my $row = 0;
		3651
		3652	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3653	my $spell = $self->{spell}{$_};
		3654
		3655	$row++;
		3656
		3657	my $spell_cb = sub {
		3658	my ($widget, $ev) = @_;
		3659
		3660	if ($ev->{button} == 1) {
		3661	$::CONN->user_send ("cast $spell->{name}");
		3662	} elsif ($ev->{button} == 2) {
		3663	$::CONN->user_send ("invoke $spell->{name}");
		3664	} elsif ($ev->{button} == 3) {
		3665	(new CFClient::UI::Menu
		3666	items => [
		3667	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3668	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3669	],
		3670	)->popup ($ev);
		3671	} else {
		3672	return 0;
		3673	}
		3674
		3675	1
		3676	};
		3677
		3678	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3679
		3680	#TODO: add path info to tooltip
		3681	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
		3682
		3683	$self->add (0, $row, new CFClient::UI::Face
		3684	face => $spell->{face},
		3685	can_hover => 1,
		3686	can_events => 1,
		3687	tooltip => $tooltip,
		3688	on_button_down => $spell_cb,
		3689	);
		3690
		3691	$self->add (1, $row, new CFClient::UI::Label
		3692	expand => 1,
		3693	text => $spell->{name},
		3694	can_hover => 1,
		3695	can_events => 1,
		3696	tooltip => $tooltip,
		3697	on_button_down => $spell_cb,
		3698	);
		3699
		3700	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3701	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3702	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3703	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3704	}
		3705	});
		3706	}
		3707
3423	sub add_spell {	3708	sub add_spell {
3424	my ($self, $spell) = @_;	3709	my ($self, $spell) = @_;
		3710
3425	$self->{spells}->{$spell->{name}} = $spell;	3711	$self->{spell}->{$spell->{name}} = $spell;
3426		3712	$self->rebuild_spell_list;
3427	$self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428	face => $spell->{face},
3429	can_hover => 1,
3430	can_events => 1,
3431	tooltip => $spell->{message});
3432
3433	$self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434	text => $spell->{name},
3435	can_hover => 1,
3436	can_events => 1,
3437	tooltip => $spell->{message},
3438	expand => 1);
3439
3440	$self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443	expand => 1);
3444
3445	$self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446	text => "bind to key",
3447	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448	}
3449
3450	sub rebuild_spell_list {
3451	my ($self) = @_;
3452	$self->{tbl_idx} = 0;
3453	$self->add_spell ($_) for values %{$self->{spells}};
3454	}	3713	}
3455		3714
3456	sub remove_spell {	3715	sub remove_spell {
3457	my ($self, $spell) = @_;	3716	my ($self, $spell) = @_;
		3717
3458	delete $self->{spells}->{$spell->{name}};	3718	delete $self->{spell}->{$spell->{name}};
3459	$self->rebuild_spell_list;	3719	$self->rebuild_spell_list;
3460	}	3720	}
3461		3721
		3722	sub clear_spells {
		3723	my ($self) = @_;
		3724
		3725	$self->{spell} = {};
		3726	$self->rebuild_spell_list;
		3727	}
		3728
3462	#############################################################################	3729	#############################################################################
3463		3730
3464	package CFClient::UI::Root;	3731	package CFClient::UI::Root;
3465		3732
3466	our @ISA = CFClient::UI::Container::;	3733	our @ISA = CFClient::UI::Container::;
		3734
		3735	use List::Util qw(min max);
3467		3736
3468	use CFClient::OpenGL;	3737	use CFClient::OpenGL;
3469		3738
3470	sub new {	3739	sub new {
3471	my $class = shift;	3740	my $class = shift;
…		…
3498	$coord = $max - $size if $coord > $max - $size;	3767	$coord = $max - $size if $coord > $max - $size;
3499		3768
3500	int $coord + 0.5	3769	int $coord + 0.5
3501	}	3770	}
3502		3771
3503	sub size_allocate {	3772	sub invoke_size_allocate {
3504	my ($self, $w, $h) = @_;	3773	my ($self, $w, $h) = @_;
3505		3774
3506	for my $child ($self->children) {	3775	for my $child ($self->children) {
3507	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3776	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3508		3777
…		…
3512	$X = _to_pixel $X, $W, $self->{w};	3781	$X = _to_pixel $X, $W, $self->{w};
3513	$Y = _to_pixel $Y, $H, $self->{h};	3782	$Y = _to_pixel $Y, $H, $self->{h};
3514		3783
3515	$child->configure ($X, $Y, $W, $H);	3784	$child->configure ($X, $Y, $W, $H);
3516	}	3785	}
		3786
		3787	1
3517	}	3788	}
3518		3789
3519	sub coord2local {	3790	sub coord2local {
3520	my ($self, $x, $y) = @_;	3791	my ($self, $x, $y) = @_;
3521		3792
…		…
3606		3877
3607	delete $queue{$widget+0};	3878	delete $queue{$widget+0};
3608		3879
3609	my ($w, $h) = $widget->size_request;	3880	my ($w, $h) = $widget->size_request;
3610		3881
3611	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3882	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3883	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3884
		3885	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3886	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613		3887
3614	$w = $widget->{force_w} if exists $widget->{force_w};	3888	$w = $widget->{force_w} if exists $widget->{force_w};
3615	$h = $widget->{force_h} if exists $widget->{force_h};	3889	$h = $widget->{force_h} if exists $widget->{force_h};
3616		3890
3617	if ($widget->{req_w} != $w || $widget->{req_h} != $h	3891	if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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