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.276 by root, Sun Jun 4 00:16:01 2006 UTC vs.
Revision 1.306 by root, Sun Jun 18 17:39:36 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	#############################################################################
798		795
799	# back-buffered drawing area	796	# back-buffered drawing area
…		…
815		812
816	$ROOT->on_post_alloc ($self => sub { $self->render_child });	813	$ROOT->on_post_alloc ($self => sub { $self->render_child });
817	$self->SUPER::update;	814	$self->SUPER::update;
818	}	815	}
819		816
820	sub size_allocate {	817	sub invoke_size_allocate {
821	my ($self, $w, $h) = @_;	818	my ($self, $w, $h) = @_;
822		819
823	$self->SUPER::size_allocate ($w, $h);
824	$self->update;	820	$self->update;
		821
		822	$self->SUPER::invoke_size_allocate ($w, $h)
825	}	823	}
826		824
827	sub _render {	825	sub _render {
828	my ($self) = @_;	826	my ($self) = @_;
829		827
…		…
856	my $tex = $self->{texture}	854	my $tex = $self->{texture}
857	or return;	855	or return;
858		856
859	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
860	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
861	glColor 1, 1, 1, 1;	859	glColor 0, 0, 0, 1;
862		860
863	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	861	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
864		862
865	glDisable GL_TEXTURE_2D;	863	glDisable GL_TEXTURE_2D;
866	}	864	}
…		…
890	$h = 10 if $self->{scroll_y};	888	$h = 10 if $self->{scroll_y};
891		889
892	($w, $h)	890	($w, $h)
893	}	891	}
894		892
895	sub size_allocate {	893	sub invoke_size_allocate {
896	my ($self, $w, $h) = @_;	894	my ($self, $w, $h) = @_;
897		895
898	my $child = $self->child;	896	my $child = $self->child;
899		897
900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
902		900
903	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
904	$self->update;	902	$self->update;
		903
		904	1
905	}	905	}
906		906
907	sub set_offset {	907	sub set_offset {
908	my ($self, $x, $y) = @_;	908	my ($self, $x, $y) = @_;
909		909
…		…
999	# todo: overwrite size_allocate of child	999	# todo: overwrite size_allocate of child
1000	my $child = $self->{vp}->child;	1000	my $child = $self->{vp}->child;
1001	$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]);
1002	}	1002	}
1003		1003
1004	sub size_allocate {	1004	sub invoke_size_allocate {
1005	my ($self, $w, $h) = @_;	1005	my ($self, $w, $h) = @_;
1006
1007	$self->SUPER::size_allocate ($w, $h);
1008		1006
1009	my $child = $self->{vp}->child;	1007	my $child = $self->{vp}->child;
1010	$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)
1011	}	1011	}
1012		1012
1013	#TODO# update range on size_allocate depending on child	1013	#TODO# update range on size_allocate depending on child
1014	# update viewport offset on scroll	1014	# update viewport offset on scroll
1015		1015
…		…
1035		1035
1036	if ($self->{bg}) {	1036	if ($self->{bg}) {
1037	my ($w, $h) = @$self{qw(w h)};	1037	my ($w, $h) = @$self{qw(w h)};
1038		1038
1039	glEnable GL_BLEND;	1039	glEnable GL_BLEND;
1040	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1040	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041	glColor @{ $self->{bg} };	1041	glColor_premultiply @{ $self->{bg} };
1042		1042
1043	glBegin GL_QUADS;	1043	glBegin GL_QUADS;
1044	glVertex 0 , 0;	1044	glVertex 0 , 0;
1045	glVertex 0 , $h;	1045	glVertex 0 , $h;
1046	glVertex $w, $h;	1046	glVertex $w, $h;
…		…
1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1070	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);
1071		1071
1072	sub new {	1072	sub new {
1073	my ($class, %arg) = @_;	1073	my ($class, %arg) = @_;
1074
1075	my $title = delete $arg{title};
1076		1074
1077	my $self = $class->SUPER::new (	1075	my $self = $class->SUPER::new (
1078	bg => [1, 1, 1, 1],	1076	bg => [1, 1, 1, 1],
1079	border_bg => [1, 1, 1, 1],	1077	border_bg => [1, 1, 1, 1],
1080	border => 0.6,	1078	border => 0.6,
…		…
1082	min_w => 16,	1080	min_w => 16,
1083	min_h => 16,	1081	min_h => 16,
1084	%arg,	1082	%arg,
1085	);	1083	);
1086		1084
1087	$self->{title} = new CFClient::UI::Label	1085	$self->{title_widget} = new CFClient::UI::Label
1088	align => 0,	1086	align => 0,
1089	valign => 1,	1087	valign => 1,
1090	text => $title,	1088	text => $self->{title},
1091	fontsize => $self->{border}	1089	fontsize => $self->{border},
1092	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	}
1093		1100
1094	$self	1101	$self
1095	}	1102	}
1096		1103
1097	sub add {	1104	sub add {
1098	my ($self, @widgets) = @_;	1105	my ($self, @widgets) = @_;
1099		1106
1100	$self->SUPER::add (@widgets);	1107	$self->SUPER::add (@widgets);
		1108	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1101	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1109	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1102	}	1110	}
1103		1111
1104	sub border {	1112	sub border {
1105	int $_[0]{border} * $::FONTSIZE	1113	int $_[0]{border} * $::FONTSIZE
1106	}	1114	}
1107		1115
1108	sub size_request {	1116	sub size_request {
1109	my ($self) = @_;	1117	my ($self) = @_;
1110		1118
1111	$self->{title}->size_request	1119	$self->{title_widget}->size_request
1112	if $self->{title};	1120	if $self->{title_widget};
		1121
		1122	$self->{close_button}->size_request
		1123	if $self->{close_button};
1113		1124
1114	my ($w, $h) = $self->SUPER::size_request;	1125	my ($w, $h) = $self->SUPER::size_request;
1115		1126
1116	(	1127	(
1117	$w + $self->border * 2,	1128	$w + $self->border * 2,
1118	$h + $self->border * 2,	1129	$h + $self->border * 2,
1119	)	1130	)
1120	}	1131	}
1121		1132
1122	sub size_allocate {	1133	sub invoke_size_allocate {
1123	my ($self, $w, $h) = @_;	1134	my ($self, $w, $h) = @_;
1124		1135
1125	if ($self->{title}) {	1136	if ($self->{title_widget}) {
1126	$self->{title}{w} = $w;	1137	$self->{title_widget}{w} = $w;
1127	$self->{title}{h} = $h;	1138	$self->{title_widget}{h} = $h;
1128	$self->{title}->size_allocate ($w, $h);	1139	$self->{title_widget}->invoke_size_allocate ($w, $h);
1129	}	1140	}
1130		1141
1131	my $border = $self->border;	1142	my $border = $self->border;
1132		1143
1133	$h -= List::Util::max 0, $border * 2;	1144	$h -= List::Util::max 0, $border * 2;
1134	$w -= List::Util::max 0, $border * 2;	1145	$w -= List::Util::max 0, $border * 2;
1135		1146
1136	$self->child->configure ($border, $border, $w, $h);	1147	$self->child->configure ($border, $border, $w, $h);
1137	}
1138		1148
		1149	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1150	if $self->{close_button};
		1151
		1152	1
		1153	}
		1154
1139	sub button_down {	1155	sub invoke_button_down {
1140	my ($self, $ev, $x, $y) = @_;	1156	my ($self, $ev, $x, $y) = @_;
1141		1157
1142	my ($w, $h) = @$self{qw(w h)};	1158	my ($w, $h) = @$self{qw(w h)};
1143	my $border = $self->border;	1159	my $border = $self->border;
1144		1160
…		…
1160	my $dy = $ev->{y} - $oy;	1176	my $dy = $ev->{y} - $oy;
1161		1177
1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1178	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1179	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164		1180
		1181	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165	$self->realloc;	1182	$self->realloc;
1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167	};	1183	};
1168		1184
1169	} elsif ($lr ^ $td) {	1185	} elsif ($lr ^ $td) {
1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1186	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1171	my ($bx, $by) = ($self->{x}, $self->{y});	1187	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1174	my ($ev, $x, $y) = @_;	1190	my ($ev, $x, $y) = @_;
1175		1191
1176	($x, $y) = ($ev->{x}, $ev->{y});	1192	($x, $y) = ($ev->{x}, $ev->{y});
1177		1193
1178	$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});
1179	};	1197	};
1180	} else {	1198	} else {
1181	return 0;	1199	return 0;
1182	}	1200	}
1183		1201
1184	1	1202	1
1185	}	1203	}
1186		1204
1187	sub button_up {	1205	sub invoke_button_up {
1188	my ($self, $ev, $x, $y) = @_;	1206	my ($self, $ev, $x, $y) = @_;
1189		1207
1190	!!delete $self->{motion}	1208	! ! delete $self->{motion}
1191	}	1209	}
1192		1210
1193	sub mouse_motion {	1211	sub invoke_mouse_motion {
1194	my ($self, $ev, $x, $y) = @_;	1212	my ($self, $ev, $x, $y) = @_;
1195		1213
1196	$self->{motion}->($ev, $x, $y) if $self->{motion};	1214	$self->{motion}->($ev, $x, $y) if $self->{motion};
1197		1215
1198	!!$self->{motion}	1216	! ! $self->{motion}
1199	}	1217	}
1200		1218
1201	sub _draw {	1219	sub _draw {
1202	my ($self) = @_;	1220	my ($self) = @_;
1203		1221
…		…
1229		1247
1230	glDisable GL_TEXTURE_2D;	1248	glDisable GL_TEXTURE_2D;
1231		1249
1232	$child->draw;	1250	$child->draw;
1233		1251
1234	if ($self->{title}) {	1252	if ($self->{title_widget}) {
1235	glTranslate 0, $border - $self->{h};	1253	glTranslate 0, $border - $self->{h};
1236	$self->{title}->_draw;	1254	$self->{title_widget}->_draw;
		1255
		1256	glTranslate 0, - ($border - $self->{h});
1237	}	1257	}
		1258
		1259	$self->{close_button}->draw
		1260	if $self->{close_button};
1238	}	1261	}
1239		1262
1240	#############################################################################	1263	#############################################################################
1241		1264
1242	package CFClient::UI::Table;	1265	package CFClient::UI::Table;
…		…
1265		1288
1266	$child->set_parent ($self);	1289	$child->set_parent ($self);
1267	$self->{children}[$y][$x] = $child;	1290	$self->{children}[$y][$x] = $child;
1268		1291
1269	$self->realloc;	1292	$self->realloc;
		1293	}
		1294
		1295	sub remove {
		1296	my ($self, $child) = @_;
		1297
		1298	# TODO: not yet implemented
1270	}	1299	}
1271		1300
1272	# 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?
1273	sub clear {	1302	sub clear {
1274	my ($self) = @_;	1303	my ($self) = @_;
…		…
1315	(sum @$ws),	1344	(sum @$ws),
1316	(sum @$hs),	1345	(sum @$hs),
1317	)	1346	)
1318	}	1347	}
1319		1348
1320	sub size_allocate {	1349	sub invoke_size_allocate {
1321	my ($self, $w, $h) = @_;	1350	my ($self, $w, $h) = @_;
1322		1351
1323	my ($ws, $hs) = $self->get_wh;	1352	my ($ws, $hs) = $self->get_wh;
1324		1353
1325	my $req_w = (sum @$ws) || 1;	1354	my $req_w = (sum @$ws) || 1;
…		…
1357	}	1386	}
1358		1387
1359	$y += $row_h;	1388	$y += $row_h;
1360	}	1389	}
1361		1390
		1391	1
1362	}	1392	}
1363		1393
1364	sub find_widget {	1394	sub find_widget {
1365	my ($self, $x, $y) = @_;	1395	my ($self, $x, $y) = @_;
1366		1396
…		…
1403	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1433	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1434	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1405	)	1435	)
1406	}	1436	}
1407		1437
1408	sub size_allocate {	1438	sub invoke_size_allocate {
1409	my ($self, $w, $h) = @_;	1439	my ($self, $w, $h) = @_;
1410		1440
1411	my $space = $self->{vertical} ? $h : $w;	1441	my $space = $self->{vertical} ? $h : $w;
1412	my $children = $self->{children};	1442	my $children = $self->{children};
1413		1443
…		…
1535		1565
1536	delete $self->{texture};	1566	delete $self->{texture};
1537	$self->SUPER::update;	1567	$self->SUPER::update;
1538	}	1568	}
1539		1569
		1570	sub realloc {
		1571	my ($self) = @_;
		1572
		1573	delete $self->{ox};
		1574	$self->SUPER::realloc;
		1575	}
		1576
1540	sub set_text {	1577	sub set_text {
1541	my ($self, $text) = @_;	1578	my ($self, $text) = @_;
1542		1579
1543	return if $self->{text} eq "T$text";	1580	return if $self->{text} eq "T$text";
1544	$self->{text} = "T$text";	1581	$self->{text} = "T$text";
1545		1582
1546	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1583	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1547	$self->{layout}->set_text ($text);	1584	$self->{layout}->set_text ($text);
1548		1585
		1586	delete $self->{size_req};
1549	$self->realloc;	1587	$self->realloc;
1550	$self->update;	1588	$self->update;
1551	}	1589	}
1552		1590
1553	sub set_markup {	1591	sub set_markup {
…		…
1559	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1597	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1560		1598
1561	$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;
1562	$self->{layout}->set_markup ($markup);	1600	$self->{layout}->set_markup ($markup);
1563		1601
		1602	delete $self->{size_req};
1564	$self->realloc;	1603	$self->realloc;
1565	$self->update;	1604	$self->update;
1566	}	1605	}
1567		1606
1568	sub size_request {	1607	sub size_request {
1569	my ($self) = @_;	1608	my ($self) = @_;
1570		1609
		1610	$self->{size_req} ||= do {
1571	$self->{layout}->set_font ($self->{font}) if $self->{font};	1611	$self->{layout}->set_font ($self->{font}) if $self->{font};
1572	$self->{layout}->set_width ($self->{max_w} || -1);	1612	$self->{layout}->set_width ($self->{max_w} || -1);
1573	$self->{layout}->set_ellipsise ($self->{ellipsise});	1613	$self->{layout}->set_ellipsise ($self->{ellipsise});
1574	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1614	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1575	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1615	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1576		1616
1577	my ($w, $h) = $self->{layout}->size;	1617	my ($w, $h) = $self->{layout}->size;
1578		1618
1579	if (exists $self->{template}) {	1619	if (exists $self->{template}) {
1580	$self->{template}->set_font ($self->{font}) if $self->{font};	1620	$self->{template}->set_font ($self->{font}) if $self->{font};
1581	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1582		1622
1583	my ($w2, $h2) = $self->{template}->size;	1623	my ($w2, $h2) = $self->{template}->size;
1584		1624
1585	$w = List::Util::max $w, $w2;	1625	$w = List::Util::max $w, $w2;
1586	$h = List::Util::max $h, $h2;	1626	$h = List::Util::max $h, $h2;
		1627	}
		1628
		1629	[$w, $h]
1587	}	1630	};
1588		1631
1589	($w, $h)	1632	@{ $self->{size_req} }
1590	}	1633	}
1591		1634
1592	sub size_allocate {	1635	sub invoke_size_allocate {
1593	my ($self, $w, $h) = @_;	1636	my ($self, $w, $h) = @_;
1594		1637
1595	delete $self->{ox};	1638	delete $self->{ox};
1596		1639
1597	delete $self->{texture}	1640	delete $self->{texture}
1598	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
1599	}	1644	}
1600		1645
1601	sub set_fontsize {	1646	sub set_fontsize {
1602	my ($self, $fontsize) = @_;	1647	my ($self, $fontsize) = @_;
1603		1648
1604	$self->{fontsize} = $fontsize;	1649	$self->{fontsize} = $fontsize;
1605	delete $self->{texture};	1650	delete $self->{texture};
1606		1651
1607	$self->realloc;	1652	$self->realloc;
		1653	}
		1654
		1655	sub reconfigure {
		1656	my ($self) = @_;
		1657
		1658	delete $self->{size_req};
		1659
		1660	$self->SUPER::reconfigure;
1608	}	1661	}
1609		1662
1610	sub _draw {	1663	sub _draw {
1611	my ($self) = @_;	1664	my ($self) = @_;
1612		1665
…		…
1632	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1685	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1633	: ($self->{h} - $tex->{h}) * 0.5);	1686	: ($self->{h} - $tex->{h}) * 0.5);
1634	};	1687	};
1635		1688
1636	glEnable GL_TEXTURE_2D;	1689	glEnable GL_TEXTURE_2D;
1637	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};
1638		1693
1639	if ($tex->{format} == GL_ALPHA) {	1694	if ($tex->{format} == GL_ALPHA) {
		1695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1640	glColor @{$self->{fg}};	1696	glColor @{$self->{fg}};
1641	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1697	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1642	} else {	1698	} else {
		1699	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1643	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1700	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1644	}	1701	}
1645		1702
1646	glDisable GL_TEXTURE_2D;	1703	glDisable GL_TEXTURE_2D;
1647	}	1704	}
1648		1705
…		…
1665	can_hover => 1,	1722	can_hover => 1,
1666	can_focus => 1,	1723	can_focus => 1,
1667	valign => 0,	1724	valign => 0,
1668	can_events => 1,	1725	can_events => 1,
1669	#text => ...	1726	#text => ...
		1727	#hidden => "*",
1670	@_	1728	@_
1671	)	1729	)
1672	}	1730	}
1673		1731
1674	sub _set_text {	1732	sub _set_text {
…		…
1681	$self->{last_activity} = $::NOW;	1739	$self->{last_activity} = $::NOW;
1682	$self->{text} = $text;	1740	$self->{text} = $text;
1683		1741
1684	$text =~ s/./*/g if $self->{hidden};	1742	$text =~ s/./*/g if $self->{hidden};
1685	$self->{layout}->set_text ("$text ");	1743	$self->{layout}->set_text ("$text ");
		1744	delete $self->{size_req};
1686		1745
1687	$self->_emit (changed => $self->{text});	1746	$self->emit (changed => $self->{text});
		1747
		1748	$self->realloc;
1688	$self->update;	1749	$self->update;
1689	}	1750	}
1690		1751
1691	sub set_text {	1752	sub set_text {
1692	my ($self, $text) = @_;	1753	my ($self, $text) = @_;
1693		1754
1694	$self->{cursor} = length $text;	1755	$self->{cursor} = length $text;
1695	$self->_set_text ($text);	1756	$self->_set_text ($text);
1696
1697	$self->realloc;
1698	}	1757	}
1699		1758
1700	sub get_text {	1759	sub get_text {
1701	$_[0]{text}	1760	$_[0]{text}
1702	}	1761	}
…		…
1707	my ($w, $h) = $self->SUPER::size_request;	1766	my ($w, $h) = $self->SUPER::size_request;
1708		1767
1709	($w + 1, $h) # add 1 for cursor	1768	($w + 1, $h) # add 1 for cursor
1710	}	1769	}
1711		1770
1712	sub key_down {	1771	sub invoke_key_down {
1713	my ($self, $ev) = @_;	1772	my ($self, $ev) = @_;
1714		1773
1715	my $mod = $ev->{mod};	1774	my $mod = $ev->{mod};
1716	my $sym = $ev->{sym};	1775	my $sym = $ev->{sym};
1717	my $uni = $ev->{unicode};	1776	my $uni = $ev->{unicode};
…		…
1729	} elsif ($sym == CFClient::SDLK_HOME) {	1788	} elsif ($sym == CFClient::SDLK_HOME) {
1730	$self->{cursor} = 0;	1789	$self->{cursor} = 0;
1731	} elsif ($sym == CFClient::SDLK_END) {	1790	} elsif ($sym == CFClient::SDLK_END) {
1732	$self->{cursor} = length $text;	1791	$self->{cursor} = length $text;
1733	} elsif ($uni == 27) {	1792	} elsif ($uni == 27) {
1734	$self->_emit ('escape');	1793	$self->emit ('escape');
1735	} elsif ($uni) {	1794	} elsif ($uni) {
1736	substr $text, $self->{cursor}++, 0, chr $uni;	1795	substr $text, $self->{cursor}++, 0, chr $uni;
1737	} else {	1796	} else {
1738	return 0;	1797	return 0;
1739	}	1798	}
…		…
1743	$self->realloc;	1802	$self->realloc;
1744		1803
1745	1	1804	1
1746	}	1805	}
1747		1806
1748	sub focus_in {	1807	sub invoke_focus_in {
1749	my ($self) = @_;	1808	my ($self) = @_;
1750		1809
1751	$self->{last_activity} = $::NOW;	1810	$self->{last_activity} = $::NOW;
1752		1811
1753	$self->SUPER::focus_in;	1812	$self->SUPER::invoke_focus_in
1754	}	1813	}
1755		1814
1756	sub button_down {	1815	sub invoke_button_down {
1757	my ($self, $ev, $x, $y) = @_;	1816	my ($self, $ev, $x, $y) = @_;
1758		1817
1759	$self->SUPER::button_down ($ev, $x, $y);	1818	$self->SUPER::invoke_button_down ($ev, $x, $y);
1760		1819
1761	my $idx = $self->{layout}->xy_to_index ($x, $y);	1820	my $idx = $self->{layout}->xy_to_index ($x, $y);
1762		1821
1763	# byte-index to char-index	1822	# byte-index to char-index
1764	my $text = $self->{text};	1823	my $text = $self->{text};
…		…
1769	$self->update;	1828	$self->update;
1770		1829
1771	1	1830	1
1772	}	1831	}
1773		1832
1774	sub mouse_motion {	1833	sub invoke_mouse_motion {
1775	my ($self, $ev, $x, $y) = @_;	1834	my ($self, $ev, $x, $y) = @_;
1776	# 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#
1777		1836
1778	0	1837	1
1779	}	1838	}
1780		1839
1781	sub _draw {	1840	sub _draw {
1782	my ($self) = @_;	1841	my ($self) = @_;
1783		1842
1784	local $self->{fg} = $self->{fg};	1843	local $self->{fg} = $self->{fg};
1785		1844
1786	if ($FOCUS == $self) {	1845	if ($FOCUS == $self) {
1787	glColor @{$self->{active_bg}};	1846	glColor_premultiply @{$self->{active_bg}};
1788	$self->{fg} = $self->{active_fg};	1847	$self->{fg} = $self->{active_fg};
1789	} else {	1848	} else {
1790	glColor @{$self->{bg}};	1849	glColor_premultiply @{$self->{bg}};
1791	}	1850	}
1792		1851
1793	glEnable GL_BLEND;	1852	glEnable GL_BLEND;
1794	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1853	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1795	glBegin GL_QUADS;	1854	glBegin GL_QUADS;
1796	glVertex 0 , 0;	1855	glVertex 0 , 0;
1797	glVertex 0 , $self->{h};	1856	glVertex 0 , $self->{h};
1798	glVertex $self->{w}, $self->{h};	1857	glVertex $self->{w}, $self->{h};
1799	glVertex $self->{w}, 0;	1858	glVertex $self->{w}, 0;
…		…
1824		1883
1825	our @ISA = CFClient::UI::EntryBase::;	1884	our @ISA = CFClient::UI::EntryBase::;
1826		1885
1827	use CFClient::OpenGL;	1886	use CFClient::OpenGL;
1828		1887
1829	sub key_down {	1888	sub invoke_key_down {
1830	my ($self, $ev) = @_;	1889	my ($self, $ev) = @_;
1831		1890
1832	my $sym = $ev->{sym};	1891	my $sym = $ev->{sym};
1833		1892
1834	if ($sym == 13) {	1893	if ($sym == 13) {
1835	unshift @{$self->{history}},	1894	unshift @{$self->{history}},
1836	my $txt = $self->get_text;	1895	my $txt = $self->get_text;
		1896
1837	$self->{history_pointer} = -1;	1897	$self->{history_pointer} = -1;
1838	$self->{history_saveback} = '';	1898	$self->{history_saveback} = '';
1839	$self->_emit (activate => $txt);	1899	$self->emit (activate => $txt);
1840	$self->update;	1900	$self->update;
1841		1901
1842	} elsif ($sym == CFClient::SDLK_UP) {	1902	} elsif ($sym == CFClient::SDLK_UP) {
1843	if ($self->{history_pointer} < 0) {	1903	if ($self->{history_pointer} < 0) {
1844	$self->{history_saveback} = $self->get_text;	1904	$self->{history_saveback} = $self->get_text;
…		…
1860	} else {	1920	} else {
1861	$self->set_text ($self->{history_saveback});	1921	$self->set_text ($self->{history_saveback});
1862	}	1922	}
1863		1923
1864	} else {	1924	} else {
1865	return $self->SUPER::key_down ($ev)	1925	return $self->SUPER::invoke_key_down ($ev)
1866	}	1926	}
1867		1927
1868	1	1928	1
1869	}	1929	}
1870		1930
…		…
1894	can_events => 1,	1954	can_events => 1,
1895	@_	1955	@_
1896	)	1956	)
1897	}	1957	}
1898		1958
1899	sub activate { }
1900
1901	sub button_up {	1959	sub invoke_button_up {
1902	my ($self, $ev, $x, $y) = @_;	1960	my ($self, $ev, $x, $y) = @_;
1903		1961
1904	$self->emit ("activate")	1962	$self->emit ("activate")
1905	if $x >= 0 && $x < $self->{w}	1963	if $x >= 0 && $x < $self->{w}
1906	&& $y >= 0 && $y < $self->{h};	1964	&& $y >= 0 && $y < $self->{h};
…		…
1909	}	1967	}
1910		1968
1911	sub _draw {	1969	sub _draw {
1912	my ($self) = @_;	1970	my ($self) = @_;
1913		1971
1914	local $self->{fg} = $self->{fg};	1972	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1915
1916	if ($GRAB == $self) {
1917	$self->{fg} = $self->{active_fg};
1918	}
1919		1973
1920	glEnable GL_TEXTURE_2D;	1974	glEnable GL_TEXTURE_2D;
1921	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1975	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1922	glColor 0, 0, 0, 1;	1976	glColor 0, 0, 0, 1;
1923		1977
1924	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1978	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1925		1979
1926	glDisable GL_TEXTURE_2D;	1980	glDisable GL_TEXTURE_2D;
1927		1981
1928	$self->SUPER::_draw;	1982	$self->SUPER::_draw;
		1983	}
		1984
		1985	#############################################################################
		1986
		1987	package CFClient::UI::ImageButton;
		1988
		1989	our @ISA = CFClient::UI::Image::;
		1990
		1991	use CFClient::OpenGL;
		1992
		1993	my %textures;
		1994
		1995	sub new {
		1996	my $class = shift;
		1997
		1998	my $self = $class->SUPER::new (
		1999	padding_x => 4,
		2000	padding_y => 4,
		2001	fg => [1, 1, 1],
		2002	active_fg => [0, 0, 1],
		2003	can_hover => 1,
		2004	align => 0,
		2005	valign => 0,
		2006	can_events => 1,
		2007	@_
		2008	);
		2009	}
		2010
		2011	sub invoke_button_up {
		2012	my ($self, $ev, $x, $y) = @_;
		2013
		2014	$self->emit ("activate")
		2015	if $x >= 0 && $x < $self->{w}
		2016	&& $y >= 0 && $y < $self->{h};
		2017
		2018	1
1929	}	2019	}
1930		2020
1931	#############################################################################	2021	#############################################################################
1932		2022
1933	package CFClient::UI::CheckBox;	2023	package CFClient::UI::CheckBox;
…		…
1960	my ($self) = @_;	2050	my ($self) = @_;
1961		2051
1962	(6) x 2	2052	(6) x 2
1963	}	2053	}
1964		2054
1965	sub button_down {	2055	sub invoke_button_down {
1966	my ($self, $ev, $x, $y) = @_;	2056	my ($self, $ev, $x, $y) = @_;
1967		2057
1968	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2058	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1969	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2059	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1970	$self->{state} = !$self->{state};	2060	$self->{state} = !$self->{state};
1971	$self->_emit (changed => $self->{state});	2061	$self->emit (changed => $self->{state});
1972	} else {	2062	} else {
1973	return 0	2063	return 0
1974	}	2064	}
1975		2065
1976	1	2066	1
…		…
2148		2238
2149	my $h1 = $self->{h} * (1 - $ycut1);	2239	my $h1 = $self->{h} * (1 - $ycut1);
2150	my $h2 = $self->{h} * (1 - $ycut2);	2240	my $h2 = $self->{h} * (1 - $ycut2);
2151		2241
2152	glEnable GL_BLEND;	2242	glEnable GL_BLEND;
2153	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2243	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2244	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2154	glEnable GL_TEXTURE_2D;	2245	glEnable GL_TEXTURE_2D;
2155	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2246	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156		2247
2157	glBindTexture GL_TEXTURE_2D, $t1->{name};	2248	glBindTexture GL_TEXTURE_2D, $t1->{name};
2158	glBegin GL_QUADS;	2249	glBegin GL_QUADS;
…		…
2272	$self->update;	2363	$self->update;
2273		2364
2274	$self	2365	$self
2275	}	2366	}
2276		2367
2277	sub changed { }
2278
2279	sub set_range {	2368	sub set_range {
2280	my ($self, $range) = @_;	2369	my ($self, $range) = @_;
2281		2370
2282	($range, $self->{range}) = ($self->{range}, $range);	2371	($range, $self->{range}) = ($self->{range}, $range);
2283		2372
2284	$self->update
2285	if "@$range" ne "@{$self->{range}}";	2373	if ("@$range" ne "@{$self->{range}}") {
		2374	$self->update;
		2375	$self->set_value ($self->{range}[0]);
		2376	}
2286	}	2377	}
2287		2378
2288	sub set_value {	2379	sub set_value {
2289	my ($self, $value) = @_;	2380	my ($self, $value) = @_;
2290		2381
…		…
2301	if $unit;	2392	if $unit;
2302		2393
2303	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2394	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2304		2395
2305	if ($value != $old_value) {	2396	if ($value != $old_value) {
2306	$self->_emit (changed => $value);	2397	$self->emit (changed => $value);
2307	$self->update;	2398	$self->update;
2308	}	2399	}
2309	}	2400	}
2310		2401
2311	sub size_request {	2402	sub size_request {
2312	my ($self) = @_;	2403	my ($self) = @_;
2313		2404
2314	($self->{req_w}, $self->{req_h})	2405	($self->{req_w}, $self->{req_h})
2315	}	2406	}
2316		2407
2317	sub button_down {	2408	sub invoke_button_down {
2318	my ($self, $ev, $x, $y) = @_;	2409	my ($self, $ev, $x, $y) = @_;
2319		2410
2320	$self->SUPER::button_down ($ev, $x, $y);	2411	$self->SUPER::invoke_button_down ($ev, $x, $y);
2321		2412
2322	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2413	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2323		2414
2324	$self->mouse_motion ($ev, $x, $y)	2415	$self->mouse_motion ($ev, $x, $y)
2325	}	2416	}
2326		2417
2327	sub mouse_motion {	2418	sub invoke_mouse_motion {
2328	my ($self, $ev, $x, $y) = @_;	2419	my ($self, $ev, $x, $y) = @_;
2329		2420
2330	if ($GRAB == $self) {	2421	if ($GRAB == $self) {
2331	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2422	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2332		2423
…		…
2437	sub set_range { shift->{slider}->set_range (@_) }	2528	sub set_range { shift->{slider}->set_range (@_) }
2438	sub set_value { shift->{slider}->set_value (@_) }	2529	sub set_value { shift->{slider}->set_value (@_) }
2439		2530
2440	#############################################################################	2531	#############################################################################
2441		2532
2442	package CFClient::UI::TextView;	2533	package CFClient::UI::TextScroller;
2443		2534
2444	our @ISA = CFClient::UI::HBox::;	2535	our @ISA = CFClient::UI::HBox::;
2445		2536
2446	use CFClient::OpenGL;	2537	use CFClient::OpenGL;
2447		2538
…		…
2449	my $class = shift;	2540	my $class = shift;
2450		2541
2451	my $self = $class->SUPER::new (	2542	my $self = $class->SUPER::new (
2452	fontsize => 1,	2543	fontsize => 1,
2453	can_events => 0,	2544	can_events => 0,
		2545	indent => 0,
2454	#font => default_font	2546	#font => default_font
2455	@_,	2547	@_,
2456		2548
2457	layout => (new CFClient::Layout 1),	2549	layout => (new CFClient::Layout 1),
2458	par => [],	2550	par => [],
…		…
2473		2565
2474	$self->{fontsize} = $fontsize;	2566	$self->{fontsize} = $fontsize;
2475	$self->reflow;	2567	$self->reflow;
2476	}	2568	}
2477		2569
2478	sub size_allocate {	2570	sub invoke_size_allocate {
2479	my ($self, $w, $h) = @_;	2571	my ($self, $w, $h) = @_;
2480
2481	$self->SUPER::size_allocate ($w, $h);
2482		2572
2483	$self->{layout}->set_font ($self->{font}) if $self->{font};	2573	$self->{layout}->set_font ($self->{font}) if $self->{font};
2484	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2574	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2485	$self->{layout}->set_width ($self->{children}[0]{w});	2575	$self->{layout}->set_width ($self->{children}[0]{w});
		2576	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2486		2577
2487	$self->reflow;	2578	$self->reflow;
		2579
		2580	$self->SUPER::invoke_size_allocate ($w, $h)
2488	}	2581	}
2489		2582
2490	sub text_size {	2583	sub text_size {
2491	my ($self, $text, $indent) = @_;	2584	my ($self, $text, $indent) = @_;
2492		2585
2493	my $layout = $self->{layout};	2586	my $layout = $self->{layout};
2494		2587
2495	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2588	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2496	$layout->set_width ($self->{children}[0]{w} - $indent);	2589	$layout->set_width ($self->{children}[0]{w} - $indent);
		2590	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2497	$layout->set_markup ($text);	2591	$layout->set_markup ($text);
2498		2592
2499	$layout->size	2593	$layout->size
2500	}	2594	}
2501		2595
…		…
2540		2634
2541	return unless $self->{h} > 0;	2635	return unless $self->{h} > 0;
2542		2636
2543	delete $self->{texture};	2637	delete $self->{texture};
2544		2638
2545	$ROOT->on_post_alloc ($self, sub {	2639	$ROOT->on_post_alloc ($self => sub {
2546	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2640	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547		2641
2548	if (delete $self->{need_reflow}) {	2642	if (delete $self->{need_reflow}) {
2549	my $height = 0;	2643	my $height = 0;
2550		2644
…		…
2553	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2647	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2554		2648
2555	for (@{$self->{par}}) {	2649	for (@{$self->{par}}) {
2556	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2650	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2557	$layout->set_width ($W - $_->[3]);	2651	$layout->set_width ($W - $_->[3]);
		2652	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2558	$layout->set_markup ($_->[4]);	2653	$layout->set_markup ($_->[4]);
2559	my ($w, $h) = $layout->size;	2654	my ($w, $h) = $layout->size;
2560	$_->[0] = $w + $_->[3];	2655	$_->[0] = $w + $_->[3];
2561	$_->[1] = $h;	2656	$_->[1] = $h;
2562	}	2657	}
…		…
2565	}	2660	}
2566		2661
2567	$self->{height} = $height;	2662	$self->{height} = $height;
2568		2663
2569	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2664	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2570		2665
2571	delete $self->{texture};	2666	delete $self->{texture};
2572	}	2667	}
2573		2668
2574	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2669	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2575	glClearColor 0.5, 0.5, 0.5, 0;	2670	glClearColor 0, 0, 0, 0;
2576	glClear GL_COLOR_BUFFER_BIT;	2671	glClear GL_COLOR_BUFFER_BIT;
2577		2672
2578	my $top = int $self->{children}[1]{range}[0];	2673	my $top = int $self->{children}[1]{range}[0];
2579		2674
2580	my $y0 = $top;	2675	my $y0 = $top;
…		…
2594	my $h = $par->[1];	2689	my $h = $par->[1];
2595		2690
2596	if ($y0 < $y + $h && $y < $y1) {	2691	if ($y0 < $y + $h && $y < $y1) {
2597	$layout->set_foreground (@{ $par->[2] });	2692	$layout->set_foreground (@{ $par->[2] });
2598	$layout->set_width ($W - $par->[3]);	2693	$layout->set_width ($W - $par->[3]);
		2694	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2599	$layout->set_markup ($par->[4]);	2695	$layout->set_markup ($par->[4]);
2600		2696
2601	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2697	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2602		2698
2603	glRasterPos $par->[3], $y - $y0;	2699	glRasterPos $par->[3], $y - $y0;
…		…
2615	sub _draw {	2711	sub _draw {
2616	my ($self) = @_;	2712	my ($self) = @_;
2617		2713
2618	glEnable GL_TEXTURE_2D;	2714	glEnable GL_TEXTURE_2D;
2619	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2715	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620	glColor 1, 1, 1, 1;	2716	glColor 0, 0, 0, 1;
2621	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2717	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2622	glDisable GL_TEXTURE_2D;	2718	glDisable GL_TEXTURE_2D;
2623		2719
2624	$self->{children}[1]->draw;	2720	$self->{children}[1]->draw;
2625		2721
2626	}	2722	}
…		…
2717	$tooltip .= "\n\n" . (ref $widget) . "\n"	2813	$tooltip .= "\n\n" . (ref $widget) . "\n"
2718	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2814	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2719	. "req $widget->{req_w} $widget->{req_h}\n"	2815	. "req $widget->{req_w} $widget->{req_h}\n"
2720	. "visible $widget->{visible}";	2816	. "visible $widget->{visible}";
2721	}	2817	}
		2818
		2819	$tooltip =~ s/^\n+//;
		2820	$tooltip =~ s/\n+$//;
2722		2821
2723	$self->add (new CFClient::UI::Label	2822	$self->add (new CFClient::UI::Label
2724	markup => $tooltip,	2823	markup => $tooltip,
2725	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2824	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2726	fontsize => 0.8,	2825	fontsize => 0.8,
…		…
2736	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2835	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2737		2836
2738	($w + 4, $h + 4)	2837	($w + 4, $h + 4)
2739	}	2838	}
2740		2839
2741	sub size_allocate {	2840	sub invoke_size_allocate {
2742	my ($self, $w, $h) = @_;	2841	my ($self, $w, $h) = @_;
2743		2842
2744	$self->SUPER::size_allocate ($w - 4, $h - 4);	2843	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2745	}	2844	}
2746		2845
2747	sub visibility_change {	2846	sub invoke_visibility_change {
2748	my ($self, $visible) = @_;	2847	my ($self, $visible) = @_;
2749		2848
2750	return unless $visible;	2849	return unless $visible;
2751		2850
2752	$self->{root}->on_post_alloc ("move_$self" => sub {	2851	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2754	or return;	2853	or return;
2755		2854
2756	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2855	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2757		2856
2758	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2857	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2759	if $x + $self->{w} > $::WIDTH;	2858	if $x + $self->{w} > $self->{root}{w};
2760		2859
2761	$self->move_abs ($x, $y);	2860	$self->move_abs ($x, $y);
2762	});	2861	});
2763	}	2862	}
2764		2863
…		…
2853	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2952	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2854		2953
2855	if ($tex) {	2954	if ($tex) {
2856	glEnable GL_TEXTURE_2D;	2955	glEnable GL_TEXTURE_2D;
2857	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2956	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2858	glColor 1, 1, 1, 1;	2957	glColor 0, 0, 0, 1;
2859	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2958	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2860	glDisable GL_TEXTURE_2D;	2959	glDisable GL_TEXTURE_2D;
2861	}	2960	}
2862	}	2961	}
2863		2962
2864	sub DESTROY {	2963	sub destroy {
2865	my ($self) = @_;	2964	my ($self) = @_;
2866		2965
2867	$self->{timer}->cancel	2966	$self->{timer}->cancel
2868	if $self->{timer};	2967	if $self->{timer};
2869		2968
2870	$self->SUPER::DESTROY;	2969	$self->SUPER::destroy;
2871	}	2970	}
2872		2971
2873	#############################################################################	2972	#############################################################################
2874		2973
2875	package CFClient::UI::Buttonbar;	2974	package CFClient::UI::Buttonbar;
…		…
2896	);	2995	);
2897		2996
2898	$self->add ($self->{vbox} = new CFClient::UI::VBox);	2997	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2899		2998
2900	for my $item (@{ $self->{items} }) {	2999	for my $item (@{ $self->{items} }) {
2901	my ($widget, $cb) = @$item;	3000	my ($widget, $cb, $tooltip) = @$item;
2902		3001
2903	# handle various types of items, only text for now	3002	# handle various types of items, only text for now
2904	if (!ref $widget) {	3003	if (!ref $widget) {
2905	$widget = new CFClient::UI::Label	3004	$widget = new CFClient::UI::Label
2906	can_hover => 1,	3005	can_hover => 1,
2907	can_events => 1,	3006	can_events => 1,
2908	text => $widget;	3007	markup => $widget,
		3008	tooltip => $tooltip
2909	}	3009	}
2910		3010
2911	$self->{item}{$widget} = $item;	3011	$self->{item}{$widget} = $item;
2912		3012
2913	$self->{vbox}->add ($widget);	3013	$self->{vbox}->add ($widget);
…		…
2918		3018
2919	# popup given the event (must be a mouse button down event currently)	3019	# popup given the event (must be a mouse button down event currently)
2920	sub popup {	3020	sub popup {
2921	my ($self, $ev) = @_;	3021	my ($self, $ev) = @_;
2922		3022
2923	$self->_emit ("popdown");	3023	$self->emit ("popdown");
2924		3024
2925	# maybe save $GRAB? must be careful about events...	3025	# maybe save $GRAB? must be careful about events...
2926	$GRAB = $self;	3026	$GRAB = $self;
2927	$self->{button} = $ev->{button};	3027	$self->{button} = $ev->{button};
2928		3028
2929	$self->show;	3029	$self->show;
2930	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3030	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2931	}	3031	}
2932		3032
2933	sub mouse_motion {	3033	sub invoke_mouse_motion {
2934	my ($self, $ev, $x, $y) = @_;	3034	my ($self, $ev, $x, $y) = @_;
2935		3035
2936	# TODO: should use vbox->find_widget or so	3036	# TODO: should use vbox->find_widget or so
2937	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3037	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2938	$self->{hover} = $self->{item}{$HOVER};	3038	$self->{hover} = $self->{item}{$HOVER};
2939		3039
2940	0	3040	0
2941	}	3041	}
2942		3042
2943	sub button_up {	3043	sub invoke_button_up {
2944	my ($self, $ev, $x, $y) = @_;	3044	my ($self, $ev, $x, $y) = @_;
2945		3045
2946	if ($ev->{button} == $self->{button}) {	3046	if ($ev->{button} == $self->{button}) {
2947	undef $GRAB;	3047	undef $GRAB;
2948	$self->hide;	3048	$self->hide;
2949		3049
2950	$self->_emit ("popdown");	3050	$self->emit ("popdown");
2951	$self->{hover}[1]->() if $self->{hover};	3051	$self->{hover}[1]->() if $self->{hover};
2952	} else {	3052	} else {
2953	return 0	3053	return 0
2954	}	3054	}
2955		3055
…		…
2992	: $self->{children}[$page_or_widget];	3092	: $self->{children}[$page_or_widget];
2993		3093
2994	$self->{current} = $widget;	3094	$self->{current} = $widget;
2995	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3095	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996		3096
2997	$self->_emit (page_changed => $self->{current});	3097	$self->emit (page_changed => $self->{current});
2998		3098
2999	$self->realloc;	3099	$self->realloc;
3000	}	3100	}
3001		3101
3002	sub visible_children {	3102	sub visible_children {
…		…
3007	my ($self) = @_;	3107	my ($self) = @_;
3008		3108
3009	$self->{current}->size_request	3109	$self->{current}->size_request
3010	}	3110	}
3011		3111
3012	sub size_allocate {	3112	sub invoke_size_allocate {
3013	my ($self, $w, $h) = @_;	3113	my ($self, $w, $h) = @_;
3014		3114
3015	$self->{current}->configure (0, 0, $w, $h);	3115	$self->{current}->configure (0, 0, $w, $h);
		3116
		3117	1
3016	}	3118	}
3017		3119
3018	sub _draw {	3120	sub _draw {
3019	my ($self) = @_;	3121	my ($self) = @_;
3020		3122
…		…
3059		3161
3060	sub set_current_page {	3162	sub set_current_page {
3061	my ($self, $page) = @_;	3163	my ($self, $page) = @_;
3062		3164
3063	$self->{multiplexer}->set_current_page ($page);	3165	$self->{multiplexer}->set_current_page ($page);
3064	$self->_emit (page_changed => $self->{multiplexer}{current});	3166	$self->emit (page_changed => $self->{multiplexer}{current});
3065	}	3167	}
3066		3168
3067	#############################################################################	3169	#############################################################################
3068		3170
3069	package CFClient::UI::Statusbox;	3171	package CFClient::UI::Combobox;
3070		3172
		3173	use utf8;
		3174
3071	our @ISA = CFClient::UI::VBox::;	3175	our @ISA = CFClient::UI::Button::;
3072		3176
3073	sub new {	3177	sub new {
3074	my $class = shift;	3178	my $class = shift;
3075		3179
3076	$class->SUPER::new (	3180	my $self = $class->SUPER::new (
		3181	options => [], # [value, title, longdesc], ...
		3182	value => undef,
		3183	@_,
		3184	);
		3185
		3186	$self->_set_value ($self->{value});
		3187
		3188	$self
		3189	}
		3190
		3191	sub invoke_button_down {
		3192	my ($self, $ev) = @_;
		3193
		3194	my @menu_items;
		3195
		3196	for (@{ $self->{options} }) {
		3197	my ($value, $title, $tooltip) = @$_;
		3198
		3199	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3200	}
		3201
		3202	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3203	}
		3204
		3205	sub _set_value {
		3206	my ($self, $value) = @_;
		3207
		3208	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3209	or return;
		3210
		3211	$self->{value} = $item->[0];
		3212	$self->set_markup ("$item->[1] ⇓");
		3213	$self->set_tooltip ($item->[2]);
		3214	}
		3215
		3216	sub set_value {
		3217	my ($self, $value) = @_;
		3218
		3219	return unless $self->{value} ne $value;
		3220
		3221	$self->_set_value ($value);
		3222	$self->emit (changed => $value);
		3223	}
		3224
		3225	#############################################################################
		3226
		3227	package CFClient::UI::Statusbox;
		3228
		3229	our @ISA = CFClient::UI::VBox::;
		3230
		3231	sub new {
		3232	my $class = shift;
		3233
		3234	my $self = $class->SUPER::new (
3077	fontsize => 0.8,	3235	fontsize => 0.8,
3078	@_,	3236	@_,
3079	)	3237	);
		3238
		3239	Scalar::Util::weaken (my $this = $self);
		3240
		3241	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3242
		3243	$self
3080	}	3244	}
3081		3245
3082	sub reorder {	3246	sub reorder {
3083	my ($self) = @_;	3247	my ($self) = @_;
3084	my $NOW = time;	3248	my $NOW = Time::HiRes::time;
		3249
		3250	# freeze display when hovering over any label
		3251	return if $CFClient::UI::TOOLTIP->{owner}
		3252	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3253	values %{ $self->{item} };
3085		3254
3086	while (my ($k, $v) = each %{ $self->{item} }) {	3255	while (my ($k, $v) = each %{ $self->{item} }) {
3087	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3256	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3088	}	3257	}
3089		3258
…		…
3092	my @items = sort {	3261	my @items = sort {
3093	$a->{pri} <=> $b->{pri}	3262	$a->{pri} <=> $b->{pri}
3094	or $b->{id} <=> $a->{id}	3263	or $b->{id} <=> $a->{id}
3095	} values %{ $self->{item} };	3264	} values %{ $self->{item} };
3096		3265
		3266	$self->{timer}->interval (1);
		3267
3097	my $count = 10 + 1;	3268	my $count = 10 + 1;
3098	for my $item (@items) {	3269	for my $item (@items) {
3099	last unless --$count;	3270	last unless --$count;
3100		3271
3101	push @widgets, $item->{label} ||= do {	3272	my $label = $item->{label} ||= do {
3102	# TODO: doesn't handle markup well (read as: at all)	3273	# TODO: doesn't handle markup well (read as: at all)
3103	my $short = $item->{count} > 1	3274	my $short = $item->{count} > 1
3104	? "<b>$item->{count} ×</b> $item->{text}"	3275	? "<b>$item->{count} ×</b> $item->{text}"
3105	: $item->{text};	3276	: $item->{text};
3106		3277
…		…
3114	tooltip => $item->{tooltip},	3285	tooltip => $item->{tooltip},
3115	tooltip_font => $::FONT_PROP,	3286	tooltip_font => $::FONT_PROP,
3116	tooltip_width => 0.67,	3287	tooltip_width => 0.67,
3117	fontsize => $item->{fontsize} || $self->{fontsize},	3288	fontsize => $item->{fontsize} || $self->{fontsize},
3118	max_w => $::WIDTH * 0.44,	3289	max_w => $::WIDTH * 0.44,
3119	fg => $item->{fg},	3290	fg => [@{ $item->{fg} }],
3120	can_events => 1,	3291	can_events => 1,
3121	can_hover => 1	3292	can_hover => 1
3122	};	3293	};
		3294
		3295	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3296	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3297	$label->update;
		3298	$label->set_max_size (undef, $label->{req_h} * $diff)
		3299	if $diff < 1;
		3300	$self->{timer}->interval (1/30);
		3301	} else {
		3302	$label->{fg}[3] = $item->{fg}[3] || 1;
		3303	}
		3304
		3305	push @widgets, $label;
3123	}	3306	}
3124		3307
3125	$self->clear;	3308	$self->clear;
3126	$self->SUPER::add (reverse @widgets);	3309	$self->SUPER::add (reverse @widgets);
3127	}	3310	}
…		…
3132	$text =~ s/^\s+//;	3315	$text =~ s/^\s+//;
3133	$text =~ s/\s+$//;	3316	$text =~ s/\s+$//;
3134		3317
3135	return unless $text;	3318	return unless $text;
3136		3319
3137	my $timeout = time + ((delete $arg{timeout}) || 60);	3320	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3138		3321
3139	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3322	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3140		3323
3141	if (my $item = $self->{item}{$group}) {	3324	if (my $item = $self->{item}{$group}) {
3142	if ($item->{text} eq $text) {	3325	if ($item->{text} eq $text) {
3143	$item->{count}++;	3326	$item->{count}++;
3144	} else {	3327	} else {
3145	$item->{count} = 1;	3328	$item->{count} = 1;
3146	$item->{text} = $item->{tooltip} = $text;	3329	$item->{text} = $item->{tooltip} = $text;
3147	}	3330	}
3148	$item->{id} = ++$self->{id};	3331	$item->{id} += 0.2;#d#
3149	$item->{timeout} = $timeout;	3332	$item->{timeout} = $timeout;
3150	delete $item->{label};	3333	delete $item->{label};
3151	} else {	3334	} else {
3152	$self->{item}{$group} = {	3335	$self->{item}{$group} = {
3153	id => ++$self->{id},	3336	id => ++$self->{id},
…		…
3172		3355
3173	$self->reorder;	3356	$self->reorder;
3174	$self->SUPER::reconfigure;	3357	$self->SUPER::reconfigure;
3175	}	3358	}
3176		3359
		3360	sub destroy {
		3361	my ($self) = @_;
		3362
		3363	$self->{timer}->cancel;
		3364
		3365	$self->SUPER::destroy;
		3366	}
		3367
3177	#############################################################################	3368	#############################################################################
3178		3369
3179	package CFClient::UI::Inventory;	3370	package CFClient::UI::Inventory;
3180		3371
3181	our @ISA = CFClient::UI::ScrolledWindow::;	3372	our @ISA = CFClient::UI::ScrolledWindow::;
…		…
3323	my ($self) = @_;	3514	my ($self) = @_;
3324	$self->ask_for_bind (1);	3515	$self->ask_for_bind (1);
3325	}	3516	}
3326		3517
3327	sub ask_for_bind {	3518	sub ask_for_bind {
3328	my ($self, $commit) = @_;	3519	my ($self, $commit, $end_cb) = @_;
3329		3520
3330	CFClient::Binder::open_binding_dialog (sub {	3521	CFClient::Binder::open_binding_dialog (sub {
3331	my ($mod, $sym) = @_;	3522	my ($mod, $sym) = @_;
3332	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?	3523	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3333	$self->update_binding_widgets;	3524	$self->update_binding_widgets;
3334	$self->commit if $commit;	3525	$self->commit if $commit;
		3526	$end_cb->() if $end_cb;
3335	});	3527	});
3336	}	3528	}
3337		3529
3338	# $mod and $sym are the modifiers and key symbol	3530	# $mod and $sym are the modifiers and key symbol
3339	# $cmds is a array ref of strings (the commands)	3531	# $cmds is a array ref of strings (the commands)
…		…
3357	}	3549	}
3358		3550
3359	# this is a shortcut method that asks for a binding	3551	# this is a shortcut method that asks for a binding
3360	# and then just binds it.	3552	# and then just binds it.
3361	sub do_quick_binding {	3553	sub do_quick_binding {
3362	my ($self, $cmds) = @_;	3554	my ($self, $cmds, $end_cb) = @_;
3363	$self->set_binding (undef, undef, $cmds, sub {	3555	$self->set_binding (undef, undef, $cmds, sub {
3364	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];	3556	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3365	});	3557	});
3366	$self->ask_for_bind (1);	3558	$self->ask_for_bind (1, $end_cb);
3367	}	3559	}
3368		3560
3369	sub update_binding_widgets {	3561	sub update_binding_widgets {
3370	my ($self) = @_;	3562	my ($self) = @_;
3371	my ($mod, $sym, $cmds) = $self->get_binding;	3563	my ($mod, $sym, $cmds) = $self->get_binding;
…		…
3427	commands => [],	3619	commands => [],
3428	@_,	3620	@_,
3429	)	3621	)
3430	}	3622	}
3431		3623
3432	# XXX: Do sorting? Argl...	3624	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3625
		3626	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3627	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3628	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3629	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
		3630	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3631	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3632	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3633	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3634	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3635	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3636
		3637	sub rebuild_spell_list {
		3638	my ($self) = @_;
		3639
		3640	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3641	$self->clear;
		3642
		3643	return unless $::CONN;
		3644
		3645	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3646	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
		3647	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3648	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3649	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3650
		3651	my $row = 0;
		3652
		3653	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3654	my $spell = $self->{spell}{$_};
		3655
		3656	$row++;
		3657
		3658	my $spell_cb = sub {
		3659	my ($widget, $ev) = @_;
		3660
		3661	if ($ev->{button} == 1) {
		3662	$::CONN->user_send ("cast $spell->{name}");
		3663	} elsif ($ev->{button} == 2) {
		3664	$::CONN->user_send ("invoke $spell->{name}");
		3665	} elsif ($ev->{button} == 3) {
		3666	(new CFClient::UI::Menu
		3667	items => [
		3668	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3669	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3670	],
		3671	)->popup ($ev);
		3672	} else {
		3673	return 0;
		3674	}
		3675
		3676	1
		3677	};
		3678
		3679	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3680
		3681	#TODO: add path info to tooltip
		3682	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
		3683
		3684	$self->add (0, $row, new CFClient::UI::Face
		3685	face => $spell->{face},
		3686	can_hover => 1,
		3687	can_events => 1,
		3688	tooltip => $tooltip,
		3689	on_button_down => $spell_cb,
		3690	);
		3691
		3692	$self->add (1, $row, new CFClient::UI::Label
		3693	expand => 1,
		3694	text => $spell->{name},
		3695	can_hover => 1,
		3696	can_events => 1,
		3697	tooltip => $tooltip,
		3698	on_button_down => $spell_cb,
		3699	);
		3700
		3701	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3702	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3703	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3704	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3705	}
		3706	});
		3707	}
		3708
3433	sub add_spell {	3709	sub add_spell {
3434	my ($self, $spell) = @_;	3710	my ($self, $spell) = @_;
		3711
3435	$self->{spells}->{$spell->{name}} = $spell;	3712	$self->{spell}->{$spell->{name}} = $spell;
3436		3713	$self->rebuild_spell_list;
3437	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3438	face => $spell->{face},
3439	can_hover => 1,
3440	can_events => 1,
3441	tooltip => $spell->{message});
3442
3443	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3444	text => $spell->{name},
3445	can_hover => 1,
3446	can_events => 1,
3447	tooltip => $spell->{message},
3448	expand => 1);
3449
3450	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3451	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3452	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3453	expand => 1);
3454
3455	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3456	text => "bind to key",
3457	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3458	}
3459
3460	sub rebuild_spell_list {
3461	my ($self) = @_;
3462	$self->{tbl_idx} = 0;
3463	$self->add_spell ($_) for values %{$self->{spells}};
3464	}	3714	}
3465		3715
3466	sub remove_spell {	3716	sub remove_spell {
3467	my ($self, $spell) = @_;	3717	my ($self, $spell) = @_;
		3718
3468	delete $self->{spells}->{$spell->{name}};	3719	delete $self->{spell}->{$spell->{name}};
3469	$self->rebuild_spell_list;	3720	$self->rebuild_spell_list;
3470	}	3721	}
3471		3722
		3723	sub clear_spells {
		3724	my ($self) = @_;
		3725
		3726	$self->{spell} = {};
		3727	$self->rebuild_spell_list;
		3728	}
		3729
3472	#############################################################################	3730	#############################################################################
3473		3731
3474	package CFClient::UI::Root;	3732	package CFClient::UI::Root;
3475		3733
3476	our @ISA = CFClient::UI::Container::;	3734	our @ISA = CFClient::UI::Container::;
		3735
		3736	use List::Util qw(min max);
3477		3737
3478	use CFClient::OpenGL;	3738	use CFClient::OpenGL;
3479		3739
3480	sub new {	3740	sub new {
3481	my $class = shift;	3741	my $class = shift;
…		…
3508	$coord = $max - $size if $coord > $max - $size;	3768	$coord = $max - $size if $coord > $max - $size;
3509		3769
3510	int $coord + 0.5	3770	int $coord + 0.5
3511	}	3771	}
3512		3772
3513	sub size_allocate {	3773	sub invoke_size_allocate {
3514	my ($self, $w, $h) = @_;	3774	my ($self, $w, $h) = @_;
3515		3775
3516	for my $child ($self->children) {	3776	for my $child ($self->children) {
3517	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3777	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3518		3778
…		…
3522	$X = _to_pixel $X, $W, $self->{w};	3782	$X = _to_pixel $X, $W, $self->{w};
3523	$Y = _to_pixel $Y, $H, $self->{h};	3783	$Y = _to_pixel $Y, $H, $self->{h};
3524		3784
3525	$child->configure ($X, $Y, $W, $H);	3785	$child->configure ($X, $Y, $W, $H);
3526	}	3786	}
		3787
		3788	1
3527	}	3789	}
3528		3790
3529	sub coord2local {	3791	sub coord2local {
3530	my ($self, $x, $y) = @_;	3792	my ($self, $x, $y) = @_;
3531		3793
…		…
3616		3878
3617	delete $queue{$widget+0};	3879	delete $queue{$widget+0};
3618		3880
3619	my ($w, $h) = $widget->size_request;	3881	my ($w, $h) = $widget->size_request;
3620		3882
3621	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3883	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3884	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3885
		3886	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3887	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3623		3888
3624	$w = $widget->{force_w} if exists $widget->{force_w};	3889	$w = $widget->{force_w} if exists $widget->{force_w};
3625	$h = $widget->{force_h} if exists $widget->{force_h};	3890	$h = $widget->{force_h} if exists $widget->{force_h};
3626		3891
3627	if ($widget->{req_w} != $w || $widget->{req_h} != $h	3892	if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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