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.202 by root, Sun May 14 20:51:19 2006 UTC vs.
Revision 1.240 by root, Fri May 26 18:28:23 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
13	our $ROOT;	14	our $ROOT;
14	our $TOOLTIP;	15	our $TOOLTIP;
…		…
31	$TOOLTIP->set_tooltip_from ($widget);	32	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	33	$TOOLTIP->show;
33		34
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	35	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35		36
36	if ($x + $TOOLTIP->{w} > $::WIDTH) {
37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38	}	38	if $x + $TOOLTIP->{w} > $::WIDTH;
39		39
40	$TOOLTIP->move ($x, $y);	40	$TOOLTIP->move ($x, $y);
41	$TOOLTIP->check_size;	41	$TOOLTIP->check_size;
42	$TOOLTIP->update;	42	$TOOLTIP->update;
43	}	43	}
…		…
51	delete $TOOLTIP->{owner};	51	delete $TOOLTIP->{owner};
52	}	52	}
53		53
54	# class methods for events	54	# class methods for events
55	sub feed_sdl_key_down_event {	55	sub feed_sdl_key_down_event {
56	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	56	$FOCUS->emit (key_down => $_[0])
57	if $FOCUS;	57	if $FOCUS;
58	}	58	}
59		59
60	sub feed_sdl_key_up_event {	60	sub feed_sdl_key_up_event {
61	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	61	$FOCUS->emit (key_up => $_[0])
62	if $FOCUS;	62	if $FOCUS;
63	}	63	}
64		64
65	sub feed_sdl_button_down_event {	65	sub feed_sdl_button_down_event {
66	my ($ev) = @_;	66	my ($ev) = @_;
…		…
75	check_tooltip;	75	check_tooltip;
76	}	76	}
77		77
78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
79		79
80	if ($GRAB) {	80	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81	($x, $y) = $GRAB->coord2local ($x, $y);	81	if $GRAB;
82	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83	}
84	}	82	}
85		83
86	sub feed_sdl_button_up_event {	84	sub feed_sdl_button_up_event {
87	my ($ev) = @_;	85	my ($ev) = @_;
88	my ($x, $y) = ($ev->{x}, $ev->{y});	86	my ($x, $y) = ($ev->{x}, $ev->{y});
89		87
90	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91		89
92	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93		91
94	if ($GRAB) {	92	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95	($x, $y) = $GRAB->coord2local ($x, $y);	93	if $GRAB;
96	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97	}
98		94
99	if (!$BUTTON_STATE) {	95	if (!$BUTTON_STATE) {
100	my $grab = $GRAB; undef $GRAB;	96	my $grab = $GRAB; undef $GRAB;
101	$grab->update if $grab;	97	$grab->update if $grab;
102	$GRAB->update if $GRAB;	98	$GRAB->update if $GRAB;
…		…
118	$HOVER->update if $HOVER && $HOVER->{can_hover};	114	$HOVER->update if $HOVER && $HOVER->{can_hover};
119		115
120	check_tooltip;	116	check_tooltip;
121	}	117	}
122		118
123	if ($HOVER) {
124	($x, $y) = $HOVER->coord2local ($x, $y);
125	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	119	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126	}	120	if $HOVER;
127	}	121	}
128		122
129	# convert position array to integers	123	# convert position array to integers
130	sub harmonize {	124	sub harmonize {
131	my ($vals) = @_;	125	my ($vals) = @_;
…		…
137	$rem += $_ - $i;	131	$rem += $_ - $i;
138	$_ = $i;	132	$_ = $i;
139	}	133	}
140	}	134	}
141		135
		136	sub full_refresh {
		137	# make a copy, otherwise for complains about freed values.
		138	my @widgets = values %WIDGET;
		139
		140	$_->update
		141	for @widgets;
		142	}
		143
		144	sub reconfigure_widgets {
		145	# make a copy, otherwise C<for> complains about freed values.
		146	my @widgets = values %WIDGET;
		147
		148	$_->reconfigure
		149	for @widgets;
		150	}
		151
142	# call when resolution changes etc.	152	# call when resolution changes etc.
143	sub rescale_widgets {	153	sub rescale_widgets {
144	my ($sx, $sy) = @_;	154	my ($sx, $sy) = @_;
145		155
146	for my $widget (values %WIDGET) {	156	for my $widget (values %WIDGET) {
147	if ($widget->{toplevel}) {	157	if ($widget->{is_toplevel}) {
148	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
149	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
151	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};	161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
153	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
154	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
155	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
156	}	166	}
157
158	$widget->reconfigure;
159	}	167	}
		168
		169	reconfigure_widgets;
160	}	170	}
161		171
162	#############################################################################	172	#############################################################################
163		173
164	package CFClient::UI::Base;	174	package CFClient::UI::Base;
…		…
196	%$self = ();	206	%$self = ();
197	}	207	}
198		208
199	sub show {	209	sub show {
200	my ($self) = @_;	210	my ($self) = @_;
201
202	return if $self->{parent};	211	return if $self->{parent};
203		212
204	$self->{toplevel} = 1;
205	$CFClient::UI::ROOT->add ($self);	213	$CFClient::UI::ROOT->add ($self);
206	}	214	}
207		215
208	sub hide {	216	sub show_centered {
209	my ($self) = @_;	217	my ($self) = @_;
		218	return if $self->{parent};
		219
		220	$self->show;
		221
		222	$CFClient::UI::ROOT->on_post_alloc (
		223	"centered $self" => sub {
		224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		225	},
		226	);
		227	}
		228
		229	sub set_invisible {
		230	my ($self) = @_;
		231
		232	# broken show/hide model
		233
		234	delete $self->{visible};
210		235
211	undef $GRAB if $GRAB == $self;	236	undef $GRAB if $GRAB == $self;
212	undef $HOVER if $HOVER == $self;	237	undef $HOVER if $HOVER == $self;
		238
		239	CFClient::UI::check_tooltip
		240	if $CFClient::UI::TOOLTIP->{owner} == $self;
		241
		242	$self->focus_out;
		243	}
		244
		245	sub hide {
		246	my ($self) = @_;
		247
		248	$self->set_invisible;
213		249
214	$self->{parent}->remove ($self)	250	$self->{parent}->remove ($self)
215	if $self->{parent};	251	if $self->{parent};
216	}	252	}
217		253
…		…
284		320
285	delete $self->{max_w}; $self->{max_w} = $w if $w;	321	delete $self->{max_w}; $self->{max_w} = $w if $w;
286	delete $self->{max_h}; $self->{max_h} = $h if $h;	322	delete $self->{max_h}; $self->{max_h} = $h if $h;
287	}	323	}
288		324
		325	sub set_tooltip {
		326	my ($self, $tooltip) = @_;
		327
		328	$tooltip =~ s/^\s+//;
		329	$tooltip =~ s/\s+$//;
		330
		331	return if $self->{tooltip} eq $tooltip;
		332
		333	$self->{tooltip} = $tooltip;
		334
		335	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		336	delete $CFClient::UI::TOOLTIP->{owner};
		337	CFClient::UI::check_tooltip;
		338	}
		339	}
		340
289	# translate global coordinates to local coordinate system	341	# translate global coordinates to local coordinate system
290	sub coord2local {	342	sub coord2local {
291	my ($self, $x, $y) = @_;	343	my ($self, $x, $y) = @_;
292		344
293	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	345	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
…		…
306	return if $FOCUS == $self;	358	return if $FOCUS == $self;
307	return unless $self->{can_focus};	359	return unless $self->{can_focus};
308		360
309	my $focus = $FOCUS; $FOCUS = $self;	361	my $focus = $FOCUS; $FOCUS = $self;
310		362
311	$self->emit (focus_in => $focus);	363	$self->_emit (focus_in => $focus);
312		364
313	$focus->update if $focus;	365	$focus->update if $focus;
314	$FOCUS->update;	366	$FOCUS->update;
315	}	367	}
316		368
…		…
319		371
320	return unless $FOCUS == $self;	372	return unless $FOCUS == $self;
321		373
322	my $focus = $FOCUS; undef $FOCUS;	374	my $focus = $FOCUS; undef $FOCUS;
323		375
324	$self->emit (focus_out => $focus);	376	$self->_emit (focus_out => $focus);
325		377
326	$focus->update if $focus; #?	378	$focus->update if $focus; #?
		379
		380	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		381	unless $FOCUS;
327	}	382	}
328		383
329	sub mouse_motion { }	384	sub mouse_motion { }
330	sub button_up { }	385	sub button_up { }
331	sub key_down { }	386	sub key_down { }
332	sub key_up { }	387	sub key_up { }
333		388
334	sub button_down {	389	sub button_down {
335	my ($self, $ev, $x, $y) = @_;	390	my ($self, $ev, $x, $y) = @_;
336		391
337	$self->focus_in;	392	$self->focus_in;
…		…
371	if ($ENV{PCLIENT_DEBUG}) {	426	if ($ENV{PCLIENT_DEBUG}) {
372	glPushMatrix;	427	glPushMatrix;
373	glColor 1, 1, 0, 1;	428	glColor 1, 1, 0, 1;
374	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	429	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
375	glBegin GL_LINE_LOOP;	430	glBegin GL_LINE_LOOP;
376	glVertex 0 , 0;	431	glVertex 0 , 0;
377	glVertex $self->{w}, 0;	432	glVertex $self->{w} - 1, 0;
378	glVertex $self->{w}, $self->{h};	433	glVertex $self->{w} - 1, $self->{h} - 1;
379	glVertex 0 , $self->{h};	434	glVertex 0 , $self->{h} - 1;
380	glEnd;	435	glEnd;
381	glPopMatrix;	436	glPopMatrix;
382	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	437	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
383	}	438	}
384	}	439	}
385		440
386	sub _draw {	441	sub _draw {
387	my ($self) = @_;	442	my ($self) = @_;
…		…
404	sub set_parent {	459	sub set_parent {
405	my ($self, $parent) = @_;	460	my ($self, $parent) = @_;
406		461
407	Scalar::Util::weaken ($self->{parent} = $parent);	462	Scalar::Util::weaken ($self->{parent} = $parent);
408		463
		464	$self->{root} = $parent->{root};
		465	$self->{visible} = $parent->{visible};
		466
409	# TODO: req_w _does_change after ->reconfigure	467	# TODO: req_w _does_change after ->reconfigure
410	$self->check_size	468	$self->check_size
411	unless exists $self->{req_w};	469	unless exists $self->{req_w};
		470
		471	$self->show;
412	}	472	}
413		473
414	sub check_size {	474	sub check_size {
415	my ($self, $forced) = @_;	475	my ($self, $forced) = @_;
416		476
…		…
429	my ($self, $signal, $cb) = @_;	489	my ($self, $signal, $cb) = @_;
430		490
431	push @{ $self->{signal_cb}{$signal} }, $cb;	491	push @{ $self->{signal_cb}{$signal} }, $cb;
432	}	492	}
433		493
		494	sub _emit {
		495	my ($self, $signal, @args) = @_;
		496
		497	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		498	}
		499
434	sub emit {	500	sub emit {
435	my ($self, $signal, @args) = @_;	501	my ($self, $signal, @args) = @_;
436		502
437	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	503	$self->_emit ($signal, @args)
		504	|| $self->$signal (@args);
438	}	505	}
439		506
440	sub DESTROY {	507	sub DESTROY {
441	my ($self) = @_;	508	my ($self) = @_;
442		509
…		…
457	my $class = shift;	524	my $class = shift;
458		525
459	# range [value, low, high, page]	526	# range [value, low, high, page]
460		527
461	$class->SUPER::new (	528	$class->SUPER::new (
462	bg => [0, 0, 0, 0.2],	529	#bg => [0, 0, 0, 0.2],
463	active_bg => [1, 1, 1, 0.5],	530	#active_bg => [1, 1, 1, 0.5],
464	@_	531	@_
465	)	532	)
466	}	533	}
467		534
468	sub _draw {	535	sub _draw {
469	my ($self) = @_;	536	my ($self) = @_;
470		537
		538	my $color = $FOCUS == $self && $self->{active_bg}
		539	? $self->{active_bg}
		540	: $self->{bg};
		541
		542	if ($color && (@$color < 4 || $color->[3])) {
471	my ($w, $h) = @$self{qw(w h)};	543	my ($w, $h) = @$self{qw(w h)};
472		544
473	glEnable GL_BLEND;	545	glEnable GL_BLEND;
474	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	546	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
475	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	547	glColor @$color;
476		548
477	glBegin GL_QUADS;	549	glBegin GL_QUADS;
478	glVertex 0 , 0;	550	glVertex 0 , 0;
479	glVertex 0 , $h;	551	glVertex 0 , $h;
480	glVertex $w, $h;	552	glVertex $w, $h;
481	glVertex $w, 0;	553	glVertex $w, 0;
482	glEnd;	554	glEnd;
483		555
484	glDisable GL_BLEND;	556	glDisable GL_BLEND;
		557	}
485	}	558	}
486		559
487	#############################################################################	560	#############################################################################
488		561
489	package CFClient::UI::Empty;	562	package CFClient::UI::Empty;
…		…
549	delete $child->{parent};	622	delete $child->{parent};
550	$child->hide;	623	$child->hide;
551		624
552	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	625	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
553		626
554	$self->check_size;	627	$self->check_size (1);
555	$self->update;	628	$self->update;
556	}	629	}
557		630
558	sub clear {	631	sub clear {
559	my ($self) = @_;	632	my ($self) = @_;
…		…
673	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	746	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
674	glClearColor 0, 0, 0, 0;	747	glClearColor 0, 0, 0, 0;
675	glClear GL_COLOR_BUFFER_BIT;	748	glClear GL_COLOR_BUFFER_BIT;
676		749
677	$self->_render;	750	$self->_render;
678	# glColorMask 1, 1, 1, 0;
679	# glEnable GL_BLEND;
680	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
681	# glRasterPos 0, 0;
682	# glCopyPixels 0, 0, $self->{w}, $self->{h};
683	# glDisable GL_BLEND;
684	# glColorMask 1, 1, 1, 1;
685	};	751	};
686	}	752	}
687		753
688	sub _draw {	754	sub _draw {
689	my ($self) = @_;	755	my ($self) = @_;
…		…
693	my $tex = $self->{texture}	759	my $tex = $self->{texture}
694	or return;	760	or return;
695		761
696	glEnable GL_TEXTURE_2D;	762	glEnable GL_TEXTURE_2D;
697	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	763	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
698	glColor 0, 0, 0, 1;	764	glColor 1, 1, 1, 1;
699		765
700	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	766	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
701		767
702	glDisable GL_TEXTURE_2D;	768	glDisable GL_TEXTURE_2D;
703	}	769	}
…		…
706		772
707	package CFClient::UI::ViewPort;	773	package CFClient::UI::ViewPort;
708		774
709	our @ISA = CFClient::UI::Window::;	775	our @ISA = CFClient::UI::Window::;
710		776
		777	sub new {
		778	my $class = shift;
		779
		780	$class->SUPER::new (
		781	scroll_x => 0,
		782	scroll_y => 1,
		783	@_,
		784	)
		785	}
		786
711	sub size_request {	787	sub size_request {
712	my ($self) = @_;	788	my ($self) = @_;
713		789
714	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	790	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
715	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
716		791
717	@$self{qw(child_w child_h)}	792	@$self{qw(child_w child_h)}
718	}	793	}
719		794
720	sub size_allocate {	795	sub size_allocate {
721	my ($self, $w, $h) = @_;	796	my ($self, $w, $h) = @_;
722		797
		798	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		799	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		800
		801	$self->child->configure (0, 0, $w, $h);
723	$self->update;	802	$self->update;
724	}	803	}
725		804
726	sub set_offset {	805	sub set_offset {
727	my ($self, $x, $y) = @_;	806	my ($self, $x, $y) = @_;
…		…
781		860
782	my $slider = new CFClient::UI::Slider	861	my $slider = new CFClient::UI::Slider
783	vertical => 1,	862	vertical => 1,
784	range => [0, 0, 1, 0.01], # HACK fix	863	range => [0, 0, 1, 0.01], # HACK fix
785	connect_changed => sub {	864	connect_changed => sub {
786	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	865	$self->{vp}->set_offset (0, $_[1]);
787	},	866	},
788	;	867	;
789		868
790	$self = $class->SUPER::new (	869	$self = $class->SUPER::new (
791	vp => (new CFClient::UI::ViewPort),	870	vp => (new CFClient::UI::ViewPort expand => 1),
792	slider => $slider,	871	slider => $slider,
793	@_,	872	@_,
794	);	873	);
795		874
796	$self->{vp}->add ($self->{scrolled});	875	$self->{vp}->add ($self->{scrolled});
797	$self->add ($self->{vp});	876	$self->add ($self->{vp});
798	$self->add ($self->{slider});	877	$self->add ($self->{slider});
799		878
800	$self	879	$self
		880	}
		881
		882	sub update {
		883	my ($self) = @_;
		884
		885	$self->SUPER::update;
		886
		887	# todo: overwrite size_allocate of child
		888	my $child = $self->{vp}->child;
		889	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		890	}
		891
		892	sub size_allocate {
		893	my ($self, $w, $h) = @_;
		894
		895	$self->SUPER::size_allocate ($w, $h);
		896
		897	my $child = $self->{vp}->child;
		898	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
801	}	899	}
802		900
803	#TODO# update range on size_allocate depending on child	901	#TODO# update range on size_allocate depending on child
804	# update viewport offset on scroll	902	# update viewport offset on scroll
805		903
…		…
859	my $class = shift;	957	my $class = shift;
860		958
861	# TODO: user_x, user_y, overwrite moveto?	959	# TODO: user_x, user_y, overwrite moveto?
862		960
863	my $self = $class->SUPER::new (	961	my $self = $class->SUPER::new (
864	bg => [1, 1, 1, 1],	962	bg => [1, 1, 1, 1],
865	border_bg => [1, 1, 1, 1],	963	border_bg => [1, 1, 1, 1],
866	border => 0.6,	964	border => 0.6,
867	toplevel => 1,	965	is_toplevel => 1,
868	can_events => 1,	966	can_events => 1,
869	@_	967	@_
870	);	968	);
871		969
872	$self->{title} &&= new CFClient::UI::Label	970	$self->{title} &&= new CFClient::UI::Label
873	align => 0,	971	align => 0,
…		…
897	my ($self, $w, $h) = @_;	995	my ($self, $w, $h) = @_;
898		996
899	$h -= List::Util::max 0, $self->border * 2;	997	$h -= List::Util::max 0, $self->border * 2;
900	$w -= List::Util::max 0, $self->border * 2;	998	$w -= List::Util::max 0, $self->border * 2;
901		999
902	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1000	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
903	if $self->{title};	1001	if $self->{title};
904		1002
905	$self->child->configure ($self->border, $self->border, $w, $h);	1003	$self->child->configure ($self->border, $self->border, $w, $h);
906	}	1004	}
907		1005
…		…
1013	sub new {	1111	sub new {
1014	my $class = shift;	1112	my $class = shift;
1015		1113
1016	$class->SUPER::new (	1114	$class->SUPER::new (
1017	col_expand => [],	1115	col_expand => [],
1018	@_	1116	@_,
1019	)	1117	)
		1118	}
		1119
		1120	sub children {
		1121	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1020	}	1122	}
1021		1123
1022	sub add {	1124	sub add {
1023	my ($self, $x, $y, $child) = @_;	1125	my ($self, $x, $y, $child) = @_;
1024		1126
1025	$child->set_parent ($self);	1127	$child->set_parent ($self);
1026	$self->{children}[$y][$x] = $child;	1128	$self->{children}[$y][$x] = $child;
1027		1129
1028	$child->check_size;	1130	$self->check_size (1);
1029	}	1131	}
1030		1132
1031	sub children {
1032	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1033	}
1034
1035	# TODO: move to container class maybe? send childs a signal on removal?	1133	# TODO: move to container class maybe? send children a signal on removal?
1036	sub clear {	1134	sub clear {
1037	my ($self) = @_;	1135	my ($self) = @_;
1038		1136
1039	my @children = $self->children;	1137	my @children = $self->children;
1040	delete $self->{children};	1138	delete $self->{children};
…		…
1042	for (@children) {	1140	for (@children) {
1043	delete $_->{parent};	1141	delete $_->{parent};
1044	$_->hide;	1142	$_->hide;
1045	}	1143	}
1046		1144
		1145	$self->check_size (1);
1047	$self->update;	1146	$self->update;
1048	}	1147	}
1049		1148
1050	sub get_wh {	1149	sub get_wh {
1051	my ($self) = @_;	1150	my ($self) = @_;
…		…
1083	sub size_allocate {	1182	sub size_allocate {
1084	my ($self, $w, $h) = @_;	1183	my ($self, $w, $h) = @_;
1085		1184
1086	my ($ws, $hs) = $self->get_wh;	1185	my ($ws, $hs) = $self->get_wh;
1087		1186
1088	my $req_w = sum @$ws;	1187	my $req_w = (sum @$ws) || 1;
1089	my $req_h = sum @$hs;	1188	my $req_h = (sum @$hs) || 1;
1090		1189
1091	# TODO: nicer code && do row_expand	1190	# TODO: nicer code && do row_expand
1092	my @col_expand = @{$self->{col_expand}};	1191	my @col_expand = @{$self->{col_expand}};
1093	@col_expand = (1) x @$ws unless @col_expand;	1192	@col_expand = (1) x @$ws unless @col_expand;
1094	my $col_expand = (sum @col_expand) || 1;	1193	my $col_expand = (sum @col_expand) || 1;
…		…
1268		1367
1269	#############################################################################	1368	#############################################################################
1270		1369
1271	package CFClient::UI::Label;	1370	package CFClient::UI::Label;
1272		1371
1273	our @ISA = CFClient::UI::Base::;	1372	our @ISA = CFClient::UI::DrawBG::;
1274		1373
1275	use CFClient::OpenGL;	1374	use CFClient::OpenGL;
1276		1375
1277	sub new {	1376	sub new {
1278	my ($class, %arg) = @_;	1377	my ($class, %arg) = @_;
1279		1378
1280	my $self = $class->SUPER::new (	1379	my $self = $class->SUPER::new (
1281	fg => [1, 1, 1],	1380	fg => [1, 1, 1],
		1381	#bg => none
		1382	#active_bg => none
1282	#font => default_font	1383	#font => default_font
1283	#text => initial text	1384	#text => initial text
1284	#markup => initial narkup	1385	#markup => initial narkup
		1386	#max_w => maximum pixel width
		1387	ellipsise => 3, # end
1285	layout => (new CFClient::Layout),	1388	layout => (new CFClient::Layout),
1286	fontsize => 1,	1389	fontsize => 1,
1287	align => -1,	1390	align => -1,
1288	valign => -1,	1391	valign => -1,
1289	padding => 2,	1392	padding => 2,
…		…
1304	}	1407	}
1305		1408
1306	$self	1409	$self
1307	}	1410	}
1308		1411
1309	sub escape {	1412	sub escape($) {
1310	local $_ = $_[1];	1413	local $_ = $_[0];
1311		1414
1312	s/&/&amp;/g;	1415	s/&/&amp;/g;
1313	s/>/&gt;/g;	1416	s/>/&gt;/g;
1314	s/</&lt;/g;	1417	s/</&lt;/g;
1315		1418
1316	$_[1]	1419	$_
1317	}	1420	}
1318		1421
1319	sub update {	1422	sub update {
1320	my ($self) = @_;	1423	my ($self) = @_;
1321		1424
…		…
1354	sub size_request {	1457	sub size_request {
1355	my ($self) = @_;	1458	my ($self) = @_;
1356		1459
1357	$self->{layout}->set_font ($self->{font}) if $self->{font};	1460	$self->{layout}->set_font ($self->{font}) if $self->{font};
1358	$self->{layout}->set_width ($self->{max_w} || -1);	1461	$self->{layout}->set_width ($self->{max_w} || -1);
		1462	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1463	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1359	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1464	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1360		1465
1361	my ($w, $h) = $self->{layout}->size;	1466	my ($w, $h) = $self->{layout}->size;
1362		1467
1363	if (exists $self->{template}) {	1468	if (exists $self->{template}) {
…		…
1393	}	1498	}
1394		1499
1395	sub _draw {	1500	sub _draw {
1396	my ($self) = @_;	1501	my ($self) = @_;
1397		1502
		1503	$self->SUPER::_draw; # draw background, if applicable
		1504
1398	my $tex = $self->{texture} ||= do {	1505	my $tex = $self->{texture} ||= do {
1399	$self->{layout}->set_foreground (@{$self->{fg}});	1506	$self->{layout}->set_foreground (@{$self->{fg}});
1400	$self->{layout}->set_font ($self->{font}) if $self->{font};	1507	$self->{layout}->set_font ($self->{font}) if $self->{font};
1401	$self->{layout}->set_width ($self->{w});	1508	$self->{layout}->set_width ($self->{w});
		1509	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1510	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1402	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1511	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1403		1512
1404	my $tex = new_from_layout CFClient::Texture $self->{layout};	1513	my $tex = new_from_layout CFClient::Texture $self->{layout};
1405		1514
1406	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1515	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1407	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1516	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1408	: ($self->{w} - $tex->{w}) * 0.5;	1517	: ($self->{w} - $tex->{w}) * 0.5);
1409		1518
1410	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1519	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1411	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1520	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1412	: ($self->{h} - $tex->{h}) * 0.5;	1521	: ($self->{h} - $tex->{h}) * 0.5);
1413		1522
1414	$tex	1523	$tex
1415	};	1524	};
1416		1525
1417	glEnable GL_TEXTURE_2D;	1526	glEnable GL_TEXTURE_2D;
…		…
1445	active_fg => [0, 0, 0],	1554	active_fg => [0, 0, 0],
1446	can_hover => 1,	1555	can_hover => 1,
1447	can_focus => 1,	1556	can_focus => 1,
1448	valign => 0,	1557	valign => 0,
1449	can_events => 1,	1558	can_events => 1,
		1559	#text => ...
1450	@_	1560	@_
1451	)	1561	)
1452	}	1562	}
1453		1563
1454	sub _set_text {	1564	sub _set_text {
…		…
1464	$self->{text} = $text;	1574	$self->{text} = $text;
1465		1575
1466	$text =~ s/./*/g if $self->{hidden};	1576	$text =~ s/./*/g if $self->{hidden};
1467	$self->{layout}->set_text ("$text ");	1577	$self->{layout}->set_text ("$text ");
1468		1578
1469	$self->emit (changed => $self->{text});	1579	$self->_emit (changed => $self->{text});
1470	}	1580	}
1471		1581
1472	sub set_text {	1582	sub set_text {
1473	my ($self, $text) = @_;	1583	my ($self, $text) = @_;
1474		1584
1475	$self->{cursor} = length $text;	1585	$self->{cursor} = length $text;
1476	$self->_set_text ($text);	1586	$self->_set_text ($text);
		1587	$self->update;
1477	$self->check_size;	1588	$self->check_size;
1478	$self->update;
1479	}	1589	}
1480		1590
1481	sub get_text {	1591	sub get_text {
1482	$_[0]{text}	1592	$_[0]{text}
1483	}	1593	}
…		…
1486	my ($self) = @_;	1596	my ($self) = @_;
1487		1597
1488	my ($w, $h) = $self->SUPER::size_request;	1598	my ($w, $h) = $self->SUPER::size_request;
1489		1599
1490	($w + 1, $h) # add 1 for cursor	1600	($w + 1, $h) # add 1 for cursor
1491	}
1492
1493	sub size_allocate {
1494	my ($self, $w, $h) = @_;
1495
1496	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1497	}	1601	}
1498		1602
1499	sub key_down {	1603	sub key_down {
1500	my ($self, $ev) = @_;	1604	my ($self, $ev) = @_;
1501		1605
…		…
1516	} elsif ($sym == CFClient::SDLK_HOME) {	1620	} elsif ($sym == CFClient::SDLK_HOME) {
1517	$self->{cursor} = 0;	1621	$self->{cursor} = 0;
1518	} elsif ($sym == CFClient::SDLK_END) {	1622	} elsif ($sym == CFClient::SDLK_END) {
1519	$self->{cursor} = length $text;	1623	$self->{cursor} = length $text;
1520	} elsif ($uni == 27) {	1624	} elsif ($uni == 27) {
1521	$self->emit ('escape');	1625	$self->_emit ('escape');
1522	} elsif ($uni) {	1626	} elsif ($uni) {
1523	substr $text, $self->{cursor}++, 0, chr $uni;	1627	substr $text, $self->{cursor}++, 0, chr $uni;
1524	}	1628	}
1525		1629
1526	$self->_set_text ($text);	1630	$self->_set_text ($text);
1527	$self->update;	1631	$self->update;
		1632	$self->check_size;
1528	}	1633	}
1529		1634
1530	sub focus_in {	1635	sub focus_in {
1531	my ($self) = @_;	1636	my ($self) = @_;
1532		1637
…		…
1612	if ($sym == 13) {	1717	if ($sym == 13) {
1613	unshift @{$self->{history}},	1718	unshift @{$self->{history}},
1614	my $txt = $self->get_text;	1719	my $txt = $self->get_text;
1615	$self->{history_pointer} = -1;	1720	$self->{history_pointer} = -1;
1616	$self->{history_saveback} = '';	1721	$self->{history_saveback} = '';
1617	$self->emit (activate => $txt);	1722	$self->_emit (activate => $txt);
1618	$self->update;	1723	$self->update;
1619		1724
1620	} elsif ($sym == CFClient::SDLK_UP) {	1725	} elsif ($sym == CFClient::SDLK_UP) {
1621	if ($self->{history_pointer} < 0) {	1726	if ($self->{history_pointer} < 0) {
1622	$self->{history_saveback} = $self->get_text;	1727	$self->{history_saveback} = $self->get_text;
…		…
1661	my $class = shift;	1766	my $class = shift;
1662		1767
1663	$class->SUPER::new (	1768	$class->SUPER::new (
1664	padding => 4,	1769	padding => 4,
1665	fg => [1, 1, 1],	1770	fg => [1, 1, 1],
1666	bg => [1, 1, 1, 0.2],
1667	active_fg => [0, 0, 1],	1771	active_fg => [0, 0, 1],
1668	can_hover => 1,	1772	can_hover => 1,
1669	align => 0,	1773	align => 0,
1670	valign => 0,	1774	valign => 0,
1671	can_events => 1,	1775	can_events => 1,
1672	@_	1776	@_
1673	)	1777	)
1674	}	1778	}
1675		1779
		1780	sub activate { }
		1781
1676	sub button_up {	1782	sub button_up {
1677	my ($self, $ev, $x, $y) = @_;	1783	my ($self, $ev, $x, $y) = @_;
1678		1784
		1785	$self->emit ("activate")
1679	if ($x >= 0 && $x < $self->{w}	1786	if $x >= 0 && $x < $self->{w}
1680	&& $y >= 0 && $y < $self->{h}) {	1787	&& $y >= 0 && $y < $self->{h};
1681	$self->emit ("activate");
1682	}
1683	}	1788	}
1684		1789
1685	sub _draw {	1790	sub _draw {
1686	my ($self) = @_;	1791	my ($self) = @_;
1687		1792
…		…
1719		1824
1720	$class->SUPER::new (	1825	$class->SUPER::new (
1721	padding => 2,	1826	padding => 2,
1722	fg => [1, 1, 1],	1827	fg => [1, 1, 1],
1723	active_fg => [1, 1, 0],	1828	active_fg => [1, 1, 0],
		1829	bg => [0, 0, 0, 0.2],
		1830	active_bg => [1, 1, 1, 0.5],
1724	state => 0,	1831	state => 0,
1725	can_hover => 1,	1832	can_hover => 1,
1726	@_	1833	@_
1727	)	1834	)
1728	}	1835	}
…		…
1737	my ($self, $ev, $x, $y) = @_;	1844	my ($self, $ev, $x, $y) = @_;
1738		1845
1739	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1846	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1740	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1847	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1741	$self->{state} = !$self->{state};	1848	$self->{state} = !$self->{state};
1742	$self->emit (changed => $self->{state});	1849	$self->_emit (changed => $self->{state});
1743	}	1850	}
1744	}	1851	}
1745		1852
1746	sub _draw {	1853	sub _draw {
1747	my ($self) = @_;	1854	my ($self) = @_;
…		…
2012	qw(s1_slider.png s1_slider_bg.png);	2119	qw(s1_slider.png s1_slider_bg.png);
2013		2120
2014	sub new {	2121	sub new {
2015	my $class = shift;	2122	my $class = shift;
2016		2123
2017	# range [value, low, high, page]	2124	# range [value, low, high, page, unit]
2018		2125
2019	# TODO: 0-width page	2126	# TODO: 0-width page
2020	# TODO: req_w/h are wrong with vertical	2127	# TODO: req_w/h are wrong with vertical
2021	# TODO: calculations are off	2128	# TODO: calculations are off
2022	my $self = $class->SUPER::new (	2129	my $self = $class->SUPER::new (
2023	fg => [1, 1, 1],	2130	fg => [1, 1, 1],
2024	active_fg => [0, 0, 0],	2131	active_fg => [0, 0, 0],
		2132	bg => [0, 0, 0, 0.2],
		2133	active_bg => [1, 1, 1, 0.5],
2025	range => [0, 0, 100, 10],	2134	range => [0, 0, 100, 10, 0],
2026	req_w => $::WIDTH / 80,	2135	req_w => $::WIDTH / 80,
2027	req_h => $::WIDTH / 80,	2136	req_h => $::WIDTH / 80,
2028	vertical => 0,	2137	vertical => 0,
2029	can_hover => 1,	2138	can_hover => 1,
2030	inner_pad => 5,	2139	inner_pad => 0.02,
2031	@_	2140	@_
2032	);	2141	);
2033		2142
		2143	$self->set_value ($self->{range}[0]);
		2144	$self->update;
		2145
2034	$self	2146	$self
		2147	}
		2148
		2149	sub set_range {
		2150	my ($self, $range) = @_;
		2151
		2152	($range, $self->{range}) = ($self->{range}, $range);
		2153
		2154	$self->update
		2155	if "@$range" ne "@{$self->{range}}";
		2156	}
		2157
		2158	sub set_value {
		2159	my ($self, $value) = @_;
		2160
		2161	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2162
		2163	$hi = $lo + 1 if $hi <= $lo;
		2164
		2165	$page = $hi - $lo if $page > $hi - $lo;
		2166
		2167	$value = $lo if $value < $lo;
		2168	$value = $hi - $page if $value > $hi - $page;
		2169
		2170	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2171	if $unit;
		2172
		2173	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2174
		2175	if ($value != $old_value) {
		2176	$self->_emit (changed => $value);
		2177	$self->update;
		2178	}
2035	}	2179	}
2036		2180
2037	sub size_request {	2181	sub size_request {
2038	my ($self) = @_;	2182	my ($self) = @_;
2039		2183
…		…
2045		2189
2046	sub button_down {	2190	sub button_down {
2047	my ($self, $ev, $x, $y) = @_;	2191	my ($self, $ev, $x, $y) = @_;
2048		2192
2049	$self->SUPER::button_down ($ev, $x, $y);	2193	$self->SUPER::button_down ($ev, $x, $y);
		2194
		2195	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2196
2050	$self->mouse_motion ($ev, $x, $y);	2197	$self->mouse_motion ($ev, $x, $y);
2051	}	2198	}
2052		2199
2053	sub mouse_motion {	2200	sub mouse_motion {
2054	my ($self, $ev, $x, $y) = @_;	2201	my ($self, $ev, $x, $y) = @_;
2055		2202
2056	if ($GRAB == $self) {	2203	if ($GRAB == $self) {
		2204	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2205
		2206	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2207
		2208	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2209
		2210	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2211	}
		2212	}
		2213
		2214	sub update {
		2215	my ($self) = @_;
		2216
		2217	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2218	$self->set_value ($self->{range}[0]);
		2219
2057	my ($value, $lo, $hi, $page) = @{$self->{range}};	2220	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2221	my $range = ($hi - $page - $lo) || 1e-100;
2058		2222
2059	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2223	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2060		2224
2061	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2225	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2062	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2226	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2063		2227
2064	$x -= $inner_pad_px; # substract the padding	2228	$value = ($value - $lo) / $range;
2065	$x = $x * ($hi - $lo) / $inner_w + $lo;	2229	$value = $value * $self->{scale} + $self->{offset};
2066	$x = $lo if $x < $lo;
2067	$x = $hi - $page if $x > $hi - $page;
2068	$self->{range}[0] = $x;
2069		2230
2070	$self->emit (changed => $x);	2231	$self->{knob_x} = $value - $knob_w * 0.5;
2071	$self->update;	2232	$self->{knob_w} = $knob_w;
2072	}	2233	});
2073	}
2074		2234
2075	# the inner_* stuff is for generating a padding for the slider handle,	2235	$self->SUPER::update;
2076	# so that the handle doesn't leave the texture. This calculation isn't 100%
2077	# correct propably, but it does the job for now
2078	sub _calc_inner_pad_px {
2079	my ($self, $w) = @_;
2080	($w / 100) * $self->{inner_pad} # % to pixels
2081	}	2236	}
2082		2237
2083	sub _draw {	2238	sub _draw {
2084	my ($self) = @_;	2239	my ($self) = @_;
2085		2240
2086	$self->SUPER::_draw ();	2241	$self->SUPER::_draw ();
2087		2242
2088	my ($w, $h) = @$self{qw(w h)};	2243	glScale $self->{w}, $self->{h};
2089		2244
2090	if ($self->{vertical}) {	2245	if ($self->{vertical}) {
2091	# draw a vertical slider like a rotated horizontal slider	2246	# draw a vertical slider like a rotated horizontal slider
2092		2247
		2248	glTranslate 1, 0, 0;
2093	glRotate 90, 0, 0, 1;	2249	glRotate 90, 0, 0, 1;
2094	glTranslate 0, -$self->{w}, 0;
2095
2096	($w, $h) = ($h, $w);
2097	}	2250	}
2098		2251
2099	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2252	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2100	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2253	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2101		2254
2102	my ($value, $lo, $hi, $page) = @{$self->{range}};
2103
2104	$hi = $value + 1 if $lo == $hi;
2105
2106	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2107	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2108
2109	$page = int $page * $inner_w / ($hi - $lo);
2110	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2111
2112	$w -= $page;
2113	$page &= ~1;
2114	glTranslate $page * 0.5, 0, 0;
2115	$page ||= 2;
2116
2117	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2118	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2119
2120	glEnable GL_TEXTURE_2D;	2255	glEnable GL_TEXTURE_2D;
2121	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2256	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2122		2257
2123	# draw background	2258	# draw background
2124	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2259	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2125		2260
2126	# draw handle	2261	# draw handle
2127	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2262	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2128		2263
2129	glDisable GL_TEXTURE_2D;	2264	glDisable GL_TEXTURE_2D;
2130	}	2265	}
		2266
		2267	#############################################################################
		2268
		2269	package CFClient::UI::ValSlider;
		2270
		2271	our @ISA = CFClient::UI::HBox::;
		2272
		2273	sub new {
		2274	my ($class, %arg) = @_;
		2275
		2276	my $range = delete $arg{range};
		2277
		2278	my $self = $class->SUPER::new (
		2279	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2280	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2281	to_value => sub { shift },
		2282	from_value => sub { shift },
		2283	%arg,
		2284	);
		2285
		2286	$self->{slider}->connect (changed => sub {
		2287	my ($self, $value) = @_;
		2288	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2289	$self->{parent}->emit (changed => $value);
		2290	});
		2291
		2292	# $self->{entry}->connect (changed => sub {
		2293	# my ($self, $value) = @_;
		2294	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2295	# $self->{parent}->emit (changed => $value);
		2296	# });
		2297
		2298	$self->add ($self->{slider}, $self->{entry});
		2299
		2300	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2301
		2302	$self
		2303	}
		2304
		2305	sub set_range { shift->{slider}->set_range (@_) }
		2306	sub set_value { shift->{slider}->set_value (@_) }
2131		2307
2132	#############################################################################	2308	#############################################################################
2133		2309
2134	package CFClient::UI::TextView;	2310	package CFClient::UI::TextView;
2135		2311
…		…
2165		2341
2166	$self->{fontsize} = $fontsize;	2342	$self->{fontsize} = $fontsize;
2167	$self->reflow;	2343	$self->reflow;
2168	}	2344	}
2169		2345
2170	sub text_height {
2171	my ($self, $text) = @_;
2172
2173	my $layout = $self->{layout};
2174
2175	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2176	$layout->set_width ($self->{children}[0]{w});
2177	$layout->set_markup ($text);
2178
2179	($layout->size)[1]
2180	}
2181
2182	sub reflow {
2183	my ($self) = @_;
2184
2185	$self->{need_reflow}++;
2186	$self->update;
2187	}
2188
2189	sub size_allocate {	2346	sub size_allocate {
2190	my ($self, $w, $h) = @_;	2347	my ($self, $w, $h) = @_;
2191		2348
2192	$self->SUPER::size_allocate ($w, $h);	2349	$self->SUPER::size_allocate ($w, $h);
2193		2350
…		…
2196	$self->{layout}->set_width ($self->{children}[0]{w});	2353	$self->{layout}->set_width ($self->{children}[0]{w});
2197		2354
2198	$self->reflow;	2355	$self->reflow;
2199	}	2356	}
2200		2357
		2358	sub text_size {
		2359	my ($self, $text, $indent) = @_;
		2360
		2361	my $layout = $self->{layout};
		2362
		2363	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2364	$layout->set_width ($self->{children}[0]{w} - $indent);
		2365	$layout->set_markup ($text);
		2366
		2367	$layout->size
		2368	}
		2369
		2370	sub reflow {
		2371	my ($self) = @_;
		2372
		2373	$self->{need_reflow}++;
		2374	$self->update;
		2375	}
		2376
		2377	sub set_offset {
		2378	my ($self, $offset) = @_;
		2379
		2380	# todo: base offset on lines or so, not on pixels
		2381	$self->{children}[1]->set_value ($offset);
		2382	}
		2383
		2384	sub clear {
		2385	my ($self) = @_;
		2386
		2387	$self->{par} = [];
		2388	$self->{height} = 0;
		2389	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2390	}
		2391
2201	sub add_paragraph {	2392	sub add_paragraph {
2202	my ($self, $color, $text) = @_;	2393	my ($self, $color, $text, $indent) = @_;
2203		2394
2204	#TODO: intelligently "reformat" paragraph	2395	for my $line (split /\n/, $text) {
2205		2396	my ($w, $h) = $self->text_size ($line);
2206	my $height = $self->text_height ($text);
2207
2208	$self->{height} += $height;	2397	$self->{height} += $h;
		2398	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2399	}
2209		2400
2210	push @{$self->{par}}, [$height, $color, $text];
2211
2212	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2401	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2213	$self->{children}[1]->update;
2214	}	2402	}
2215		2403
2216	sub update {	2404	sub update {
2217	my ($self) = @_;	2405	my ($self) = @_;
2218		2406
…		…
2221	return unless $self->{h} > 0;	2409	return unless $self->{h} > 0;
2222		2410
2223	delete $self->{texture};	2411	delete $self->{texture};
2224		2412
2225	$ROOT->on_post_alloc ($self, sub {	2413	$ROOT->on_post_alloc ($self, sub {
		2414	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2415
2226	if (delete $self->{need_reflow}) {	2416	if (delete $self->{need_reflow}) {
2227	my $height = 0;	2417	my $height = 0;
2228		2418
2229	$height += $_->[0] = $self->text_height ($_->[2])	2419	my $layout = $self->{layout};
		2420
		2421	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2422
2230	for @{$self->{par}};	2423	for (@{$self->{par}}) {
		2424	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2425	$layout->set_width ($W - $_->[3]);
		2426	$layout->set_markup ($_->[4]);
		2427	my ($w, $h) = $layout->size;
		2428	$_->[0] = $w + $_->[3];
		2429	$_->[1] = $h;
		2430	}
		2431
		2432	$height += $_->[1];
		2433	}
2231		2434
2232	$self->{height} = $height;	2435	$self->{height} = $height;
2233		2436
2234	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2437	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2235		2438
2236	delete $self->{texture};	2439	delete $self->{texture};
2237	}	2440	}
2238		2441
2239	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2442	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2240	glClearColor 0, 0, 0, 0;	2443	glClearColor 0.5, 0.5, 0.5, 0;
2241	glClear GL_COLOR_BUFFER_BIT;	2444	glClear GL_COLOR_BUFFER_BIT;
2242		2445
2243	glEnable GL_TEXTURE_2D;
2244	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245
2246	my $top = int $self->{children}[1]{range}[0];	2446	my $top = int $self->{children}[1]{range}[0];
2247		2447
2248	my $y0 = $top;	2448	my $y0 = $top;
2249	my $y1 = $top + $self->{h};	2449	my $y1 = $top + $H;
2250		2450
2251	my $y = 0;	2451	my $y = 0;
2252		2452
2253	my $layout = $self->{layout};	2453	my $layout = $self->{layout};
2254		2454
2255	$layout->set_font ($self->{font}) if $self->{font};	2455	$layout->set_font ($self->{font}) if $self->{font};
2256		2456
		2457	glEnable GL_BLEND;
		2458	#TODO# not correct in windows where rgba is forced off
		2459	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2460
2257	for my $par (@{$self->{par}}) {	2461	for my $par (@{$self->{par}}) {
2258	my $h = $par->[0];	2462	my $h = $par->[1];
2259		2463
2260	if ($y0 < $y + $h && $y < $y1) {	2464	if ($y0 < $y + $h && $y < $y1) {
2261	$layout->set_foreground (@{ $par->[1] });	2465	$layout->set_foreground (@{ $par->[2] });
		2466	$layout->set_width ($W - $par->[3]);
2262	$layout->set_markup ($par->[2]);	2467	$layout->set_markup ($par->[4]);
2263		2468
2264	my ($W, $H) = $layout->size;	2469	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2265	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2470
		2471	glRasterPos $par->[3], $y - $y0;
		2472	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2266	}	2473	}
2267		2474
2268	$y += $h;	2475	$y += $h;
2269	}	2476	}
2270		2477
2271	glDisable GL_TEXTURE_2D;	2478	glDisable GL_BLEND;
2272	};	2479	};
2273	});	2480	});
2274	}	2481	}
2275		2482
2276	sub _draw {	2483	sub _draw {
2277	my ($self) = @_;	2484	my ($self) = @_;
2278		2485
2279	glEnable GL_TEXTURE_2D;	2486	glEnable GL_TEXTURE_2D;
2280	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2487	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2281	glColor 1, 1, 1, 1;	2488	glColor 1, 1, 1, 1;
2282	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2489	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2283	glDisable GL_TEXTURE_2D;	2490	glDisable GL_TEXTURE_2D;
2284		2491
2285	$self->{children}[1]->draw;	2492	$self->{children}[1]->draw;
2286		2493
2287	}	2494	}
…		…
2356		2563
2357	# TODO: use animation	2564	# TODO: use animation
2358	if ($self->{state} = !$self->{state}) {	2565	if ($self->{state} = !$self->{state}) {
2359	$CFClient::UI::ROOT->add ($self->{other});	2566	$CFClient::UI::ROOT->add ($self->{other});
2360	$self->{other}->move ($self->coord2global (0, $self->{h}));	2567	$self->{other}->move ($self->coord2global (0, $self->{h}));
2361	$self->emit ("open");	2568	$self->_emit ("open");
2362	} else {	2569	} else {
2363	$CFClient::UI::ROOT->remove ($self->{other});	2570	$CFClient::UI::ROOT->remove ($self->{other});
2364	$self->emit ("close");	2571	$self->_emit ("close");
2365	}	2572	}
2366		2573
2367	$self->emit (changed => $self->{state});	2574	$self->_emit (changed => $self->{state});
2368	}	2575	}
2369		2576
2370	#############################################################################	2577	#############################################################################
2371		2578
2372	package CFClient::UI::Tooltip;	2579	package CFClient::UI::Tooltip;
…		…
2386		2593
2387	sub set_tooltip_from {	2594	sub set_tooltip_from {
2388	my ($self, $widget) = @_;	2595	my ($self, $widget) = @_;
2389		2596
2390	$self->add (new CFClient::UI::Label	2597	$self->add (new CFClient::UI::Label
2391	markup => $widget->{tooltip},	2598	markup => $widget->{tooltip},
2392	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2599	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2393	fontsize => 0.8,	2600	fontsize => 0.8,
2394	fg => [0, 0, 0, 1],	2601	fg => [0, 0, 0, 1],
		2602	ellipsise => 0,
2395	font => ($widget->{tooltip_font} || $::FONT_PROP),	2603	font => ($widget->{tooltip_font} || $::FONT_PROP),
2396	);	2604	);
2397	}	2605	}
2398		2606
2399	sub size_request {	2607	sub size_request {
2400	my ($self) = @_;	2608	my ($self) = @_;
…		…
2446	use CFClient::OpenGL;	2654	use CFClient::OpenGL;
2447		2655
2448	sub new {	2656	sub new {
2449	my $class = shift;	2657	my $class = shift;
2450		2658
2451	$class->SUPER::new (	2659	my $self = $class->SUPER::new (
2452	aspect => 1,	2660	aspect => 1,
		2661	can_events => 0,
2453	@_,	2662	@_,
2454	)	2663	);
		2664
		2665	if ($self->{anim} && $self->{animspeed}) {
		2666	Scalar::Util::weaken (my $widget = $self);
		2667
		2668	$self->{timer} = Event->timer (
		2669	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2670	hard => 1,
		2671	interval => $self->{animspeed},
		2672	cb => sub {
		2673	++$widget->{frame};
		2674	$widget->update;
		2675	},
		2676	);
		2677	}
		2678
		2679	$self
2455	}	2680	}
2456		2681
2457	sub size_request {	2682	sub size_request {
2458	(32, 8)	2683	(32, 8)
2459	}	2684	}
2460		2685
		2686	sub update {
		2687	my ($self) = @_;
		2688
		2689	return unless $self->{visible};
		2690
		2691	$self->SUPER::update;
		2692	}
		2693
2461	sub _draw {	2694	sub _draw {
2462	my ($self) = @_;	2695	my ($self) = @_;
2463		2696
2464	return unless $::CONN;#d# manage and cache textures differently	2697	return unless $::CONN;
		2698
		2699	my $face;
		2700
		2701	if ($self->{frame}) {
		2702	my $anim = $::CONN->{anim}[$self->{anim}];
		2703
		2704	$face = $anim->[ $self->{frame} % @$anim ]
		2705	if $anim && @$anim;
		2706	}
		2707
2465	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2708	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2466		2709
2467	# TODO animation
2468	if ($tex) {	2710	if ($tex) {
2469	glEnable GL_TEXTURE_2D;	2711	glEnable GL_TEXTURE_2D;
2470	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2712	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2471	glColor 1, 1, 1, 1;	2713	glColor 1, 1, 1, 1;
2472	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2714	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2473	glDisable GL_TEXTURE_2D;	2715	glDisable GL_TEXTURE_2D;
2474	}	2716	}
2475	}	2717	}
2476		2718
		2719	sub DESTROY {
		2720	my ($self) = @_;
		2721
		2722	$self->{timer}->cancel
		2723	if $self->{timer};
		2724
		2725	$self->SUPER::DESTROY;
		2726	}
		2727
2477	#############################################################################	2728	#############################################################################
2478		2729
2479	package CFClient::UI::InventoryItem;	2730	package CFClient::UI::Inventory;
2480		2731
2481	our @ISA = CFClient::UI::HBox::;	2732	our @ISA = CFClient::UI::ScrolledWindow::;
2482		2733
2483	sub new {	2734	sub new {
2484	my $class = shift;	2735	my $class = shift;
2485		2736
2486	my %args = @_;
2487
2488	my $item = delete $args{item};
2489
2490	my $desc = $item->{nrof} < 2
2491	? $item->{name}
2492	: "$item->{nrof} $item->{name_pl}";
2493
2494
2495	my $self = $class->SUPER::new (	2737	my $self = $class->SUPER::new (
2496	can_hover => 1,	2738	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2497	can_events => 1,
2498	tooltip => (CFClient::UI::Label->escape ($desc)
2499	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500	connect_button_down => sub {
2501	my ($self, $ev, $x, $y) = @_;
2502
2503	# todo: maybe put examine on 1? but should just be a tooltip :(
2504	if ($ev->{button} == 1) {
2505	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2506	} elsif ($ev->{button} == 2) {
2507	$::CONN->send ("apply $item->{tag}");
2508	} elsif ($ev->{button} == 3) {
2509	CFClient::UI::Menu->new (
2510	items => [
2511	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2512	[
2513	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514	sub { $::CONN->send ("lock $item->{tag}") },
2515	],
2516	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2517	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2518	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2519	],
2520	)->popup ($ev);
2521	}
2522
2523	1
2524	},
2525	%args
2526	);
2527
2528	$self->add (new CFClient::UI::Face
2529	can_events => 0,
2530	face => $item->{face},
2531	anim => $item->{anim},
2532	animspeed => $item->{animspeed},
2533	);
2534
2535	$self->add (new CFClient::UI::Label
2536	can_events => 0,
2537	text => $desc,
2538	);
2539
2540	$self
2541	}
2542
2543	#############################################################################
2544
2545	package CFClient::UI::Inventory;
2546
2547	our @ISA = CFClient::UI::ScrolledWindow::;
2548
2549	sub new {
2550	my $class = shift;
2551
2552	my $self = $class->SUPER::new (
2553	scrolled => (new CFClient::UI::VBox),
2554	@_,	2739	@_,
2555	);	2740	);
2556		2741
2557	$self	2742	$self
2558	}	2743	}
…		…
2568	or ($a->{name} cmp $b->{name})	2753	or ($a->{name} cmp $b->{name})
2569	} @$items;	2754	} @$items;
2570		2755
2571	$self->{real_items} = \@items;	2756	$self->{real_items} = \@items;
2572		2757
		2758	my $row = 0;
2573	for my $item (@items) {	2759	for my $item (@items) {
2574	my $desc = $item->{nrof} < 2	2760	CFClient::Item::update_widgets $item;
2575	? $item->{name}
2576	: "$item->{nrof} $item->{name_pl}";
2577		2761
2578	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2762	$self->{scrolled}->add (0, $row, $item->{face_widget});
2579	}	2763	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2764	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2580		2765
2581	$self->{scrolled}->add (@items);	2766	$row++;
2582		2767	}
2583	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2584	}	2768	}
2585		2769
2586	sub size_request {	2770	sub size_request {
2587	my ($self) = @_;	2771	my ($self) = @_;
2588	($self->{req_w}, $self->{req_h});	2772	($self->{req_w}, $self->{req_h});
…		…
2628		2812
2629	# popup given the event (must be a mouse button down event currently)	2813	# popup given the event (must be a mouse button down event currently)
2630	sub popup {	2814	sub popup {
2631	my ($self, $ev) = @_;	2815	my ($self, $ev) = @_;
2632		2816
2633	$self->emit ("popdown");	2817	$self->_emit ("popdown");
2634		2818
2635	# maybe save $GRAB? must be careful about events...	2819	# maybe save $GRAB? must be careful about events...
2636	$GRAB = $self;	2820	$GRAB = $self;
2637	$self->{button} = $ev->{button};	2821	$self->{button} = $ev->{button};
2638		2822
…		…
2653		2837
2654	if ($ev->{button} == $self->{button}) {	2838	if ($ev->{button} == $self->{button}) {
2655	undef $GRAB;	2839	undef $GRAB;
2656	$self->hide;	2840	$self->hide;
2657		2841
2658	$self->emit ("popdown");	2842	$self->_emit ("popdown");
2659	$self->{hover}[1]->() if $self->{hover};	2843	$self->{hover}[1]->() if $self->{hover};
2660	}	2844	}
2661	}	2845	}
2662		2846
2663	#############################################################################	2847	#############################################################################
2664		2848
2665	package CFClient::UI::Statusbox;	2849	package CFClient::UI::Statusbox;
2666		2850
2667	our @ISA = CFClient::UI::VBox::;	2851	our @ISA = CFClient::UI::VBox::;
		2852
		2853	sub new {
		2854	my $class = shift;
		2855
		2856	$class->SUPER::new (
		2857	fontsize => 0.8,
		2858	@_,
		2859	)
		2860	}
2668		2861
2669	sub reorder {	2862	sub reorder {
2670	my ($self) = @_;	2863	my ($self) = @_;
2671	my $NOW = time;	2864	my $NOW = time;
2672		2865
…		…
2691	? "<b>$item->{count} ×</b> $item->{text}"	2884	? "<b>$item->{count} ×</b> $item->{text}"
2692	: $item->{text};	2885	: $item->{text};
2693		2886
2694	for ($short) {	2887	for ($short) {
2695	s/^\s+//;	2888	s/^\s+//;
2696	s/\012.*/…/s;	2889	s/\s+/ /g;
2697	my $len = int 40 / $item->{fontsize};
2698	substr $_, $len, length, "…" if $len < length;
2699	}	2890	}
2700		2891
2701	new CFClient::UI::Label	2892	new CFClient::UI::Label
2702	markup => $short,	2893	markup => $short,
2703	tooltip => $item->{tooltip},	2894	tooltip => $item->{tooltip},
2704	tooltip_font => $::FONT_PROP,	2895	tooltip_font => $::FONT_PROP,
2705	tooltip_width => 0.67,	2896	tooltip_width => 0.67,
2706	fontsize => $item->{fontsize},	2897	fontsize => $item->{fontsize} || $self->{fontsize},
		2898	max_w => $::WIDTH * 0.44,
2707	color => $item->{color},	2899	fg => $item->{fg},
2708	can_events => 1,	2900	can_events => 1,
2709	can_hover => 1	2901	can_hover => 1
2710	};	2902	};
2711	}	2903	}
2712		2904
…		…
2717	sub add {	2909	sub add {
2718	my ($self, $text, %arg) = @_;	2910	my ($self, $text, %arg) = @_;
2719		2911
2720	$text =~ s/^\s+//;	2912	$text =~ s/^\s+//;
2721	$text =~ s/\s+$//;	2913	$text =~ s/\s+$//;
		2914
		2915	return unless $text;
2722		2916
2723	my $timeout = time + ((delete $arg{timeout}) || 60);	2917	my $timeout = time + ((delete $arg{timeout}) || 60);
2724		2918
2725	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2919	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2726		2920
…		…
2738	$self->{item}{$group} = {	2932	$self->{item}{$group} = {
2739	id => ++$self->{id},	2933	id => ++$self->{id},
2740	text => $text,	2934	text => $text,
2741	timeout => $timeout,	2935	timeout => $timeout,
2742	tooltip => $text,	2936	tooltip => $text,
2743	fontsize => 0.8,
2744	color => [0.8, 0.8, 0.8, 0.8],	2937	fg => [0.8, 0.8, 0.8, 0.8],
2745	pri => 0,	2938	pri => 0,
2746	count => 1,	2939	count => 1,
2747	%arg,	2940	%arg,
2748	};	2941	};
2749	}	2942	}
2750		2943
2751	$self->reorder;	2944	$self->reorder;
2752	}	2945	}
2753		2946
		2947	sub reconfigure {
		2948	my ($self) = @_;
		2949
		2950	delete $_->{label}
		2951	for values %{ $self->{item} || {} };
		2952
		2953	$self->reorder;
		2954	$self->SUPER::reconfigure;
		2955	}
		2956
2754	#############################################################################	2957	#############################################################################
2755		2958
2756	package CFClient::UI::Root;	2959	package CFClient::UI::Root;
2757		2960
2758	our @ISA = CFClient::UI::Container::;	2961	our @ISA = CFClient::UI::Container::;
…		…
2788	}	2991	}
2789		2992
2790	sub size_allocate {	2993	sub size_allocate {
2791	my ($self, $w, $h) = @_;	2994	my ($self, $w, $h) = @_;
2792		2995
2793	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2794	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2795
2796	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2797	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2798
2799	for my $child ($self->children) {	2996	for my $child ($self->children) {
2800	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2997	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2801		2998
		2999	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3000	if exists $child->{req_x};
		3001
		3002	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3003	if exists $child->{req_y};
		3004
2802	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3005	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2803	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3006	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3007
2804	$child->configure ($X, $Y, $W, $H);	3008	$child->configure ($X, $Y, $W, $H);
2805	}	3009	}
2806	}	3010	}
2807		3011
2808	sub coord2local {	3012	sub coord2local {
…		…
2823	$self->check_size;	3027	$self->check_size;
2824	$::WANT_REFRESH++;	3028	$::WANT_REFRESH++;
2825	}	3029	}
2826		3030
2827	sub add {	3031	sub add {
2828	my ($self, $child) = @_;	3032	my ($self, @children) = @_;
2829		3033
		3034	for (my @widgets = @children; my $w = pop @widgets; ) {
		3035	push @widgets, $w->children;
		3036	$w->{root} = $self;
		3037	$w->{visible} = 1;
		3038	}
		3039
		3040	for my $child (@children) {
		3041	$child->{is_toplevel} = 1;
		3042
2830	# integerise window positions	3043	# integerise window positions
2831	$child->{x} = int $child->{x};	3044	$child->{x} = int $child->{x};
2832	$child->{y} = int $child->{y};	3045	$child->{y} = int $child->{y};
		3046	}
2833		3047
2834	$self->SUPER::add ($child);	3048	$self->SUPER::add (@children);
		3049	}
		3050
		3051	sub remove {
		3052	my ($self, @children) = @_;
		3053
		3054	$self->SUPER::remove (@children);
		3055
		3056	while (@children) {
		3057	my $w = pop @children;
		3058	push @children, $w->children;
		3059	$w->set_invisible;
		3060	}
2835	}	3061	}
2836		3062
2837	sub on_refresh {	3063	sub on_refresh {
2838	my ($self, $id, $cb) = @_;	3064	my ($self, $id, $cb) = @_;
2839		3065
…		…
2892	$w = 0 if $w < 0;	3118	$w = 0 if $w < 0;
2893	$h = 0 if $h < 0;	3119	$h = 0 if $h < 0;
2894		3120
2895	$widget->{w} = $w;	3121	$widget->{w} = $w;
2896	$widget->{h} = $h;	3122	$widget->{h} = $h;
2897	$widget->size_allocate ($w, $h);
2898	$widget->emit (size_allocate => $w, $h);	3123	$widget->emit (size_allocate => $w, $h);
2899	}	3124	}
2900	}	3125	}
2901		3126
2902	while ($self->{post_alloc_hook}) {	3127	while ($self->{post_alloc_hook}) {
…		…
2908	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3133	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2909	glClear GL_COLOR_BUFFER_BIT;	3134	glClear GL_COLOR_BUFFER_BIT;
2910		3135
2911	glMatrixMode GL_PROJECTION;	3136	glMatrixMode GL_PROJECTION;
2912	glLoadIdentity;	3137	glLoadIdentity;
2913	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3138	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2914	glMatrixMode GL_MODELVIEW;	3139	glMatrixMode GL_MODELVIEW;
2915	glLoadIdentity;	3140	glLoadIdentity;
2916		3141
2917	$self->_draw;	3142	$self->_draw;
2918	}	3143	}
…		…
2920	#############################################################################	3145	#############################################################################
2921		3146
2922	package CFClient::UI;	3147	package CFClient::UI;
2923		3148
2924	$ROOT = new CFClient::UI::Root;	3149	$ROOT = new CFClient::UI::Root;
2925	$TOOLTIP = new CFClient::UI::Tooltip;	3150	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2926		3151
2927	1	3152	1
2928		3153

Diff Legend

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