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

Diff Legend

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