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.238 by root, Thu May 25 21:48:22 2006 UTC

…		…
31	$TOOLTIP->set_tooltip_from ($widget);	31	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	32	$TOOLTIP->show;
33		33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35		35
36	if ($x + $TOOLTIP->{w} > $::WIDTH) {
37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
39		38
40	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
41	$TOOLTIP->check_size;	40	$TOOLTIP->check_size;
42	$TOOLTIP->update;	41	$TOOLTIP->update;
43	}	42	}
…		…
51	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
52	}	51	}
53		52
54	# class methods for events	53	# class methods for events
55	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
56	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	55	$FOCUS->emit (key_down => $_[0])
57	if $FOCUS;	56	if $FOCUS;
58	}	57	}
59		58
60	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
61	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	60	$FOCUS->emit (key_up => $_[0])
62	if $FOCUS;	61	if $FOCUS;
63	}	62	}
64		63
65	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
66	my ($ev) = @_;	65	my ($ev) = @_;
…		…
75	check_tooltip;	74	check_tooltip;
76	}	75	}
77		76
78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
79		78
80	if ($GRAB) {	79	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81	($x, $y) = $GRAB->coord2local ($x, $y);	80	if $GRAB;
82	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83	}
84	}	81	}
85		82
86	sub feed_sdl_button_up_event {	83	sub feed_sdl_button_up_event {
87	my ($ev) = @_;	84	my ($ev) = @_;
88	my ($x, $y) = ($ev->{x}, $ev->{y});	85	my ($x, $y) = ($ev->{x}, $ev->{y});
89		86
90	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91		88
92	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93		90
94	if ($GRAB) {	91	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95	($x, $y) = $GRAB->coord2local ($x, $y);	92	if $GRAB;
96	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97	}
98		93
99	if (!$BUTTON_STATE) {	94	if (!$BUTTON_STATE) {
100	my $grab = $GRAB; undef $GRAB;	95	my $grab = $GRAB; undef $GRAB;
101	$grab->update if $grab;	96	$grab->update if $grab;
102	$GRAB->update if $GRAB;	97	$GRAB->update if $GRAB;
…		…
118	$HOVER->update if $HOVER && $HOVER->{can_hover};	113	$HOVER->update if $HOVER && $HOVER->{can_hover};
119		114
120	check_tooltip;	115	check_tooltip;
121	}	116	}
122		117
123	if ($HOVER) {
124	($x, $y) = $HOVER->coord2local ($x, $y);
125	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	118	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126	}	119	if $HOVER;
127	}	120	}
128		121
129	# convert position array to integers	122	# convert position array to integers
130	sub harmonize {	123	sub harmonize {
131	my ($vals) = @_;	124	my ($vals) = @_;
…		…
137	$rem += $_ - $i;	130	$rem += $_ - $i;
138	$_ = $i;	131	$_ = $i;
139	}	132	}
140	}	133	}
141		134
		135	sub full_refresh {
		136	# make a copy, otherwise for complains about freed values.
		137	my @widgets = values %WIDGET;
		138
		139	$_->update
		140	for @widgets;
		141	}
		142
		143	sub reconfigure_widgets {
		144	# make a copy, otherwise C<for> complains about freed values.
		145	my @widgets = values %WIDGET;
		146
		147	$_->reconfigure
		148	for @widgets;
		149	}
		150
142	# call when resolution changes etc.	151	# call when resolution changes etc.
143	sub rescale_widgets {	152	sub rescale_widgets {
144	my ($sx, $sy) = @_;	153	my ($sx, $sy) = @_;
145		154
146	for my $widget (values %WIDGET) {	155	for my $widget (values %WIDGET) {
147	if ($widget->{toplevel}) {	156	if ($widget->{is_toplevel}) {
148	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	157	$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};	158	$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};	159	$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};	160	$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};	161	$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};	162	$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};	163	$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};	164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
156	}	165	}
157
158	$widget->reconfigure;
159	}	166	}
		167
		168	reconfigure_widgets;
160	}	169	}
161		170
162	#############################################################################	171	#############################################################################
163		172
164	package CFClient::UI::Base;	173	package CFClient::UI::Base;
…		…
196	%$self = ();	205	%$self = ();
197	}	206	}
198		207
199	sub show {	208	sub show {
200	my ($self) = @_;	209	my ($self) = @_;
201
202	return if $self->{parent};	210	return if $self->{parent};
203		211
204	$CFClient::UI::ROOT->add ($self);	212	$CFClient::UI::ROOT->add ($self);
205	}	213	}
206		214
207	sub hide {	215	sub show_centered {
208	my ($self) = @_;	216	my ($self) = @_;
		217	return if $self->{parent};
		218
		219	$self->show;
		220
		221	$CFClient::UI::ROOT->on_post_alloc (
		222	"centered $self" => sub {
		223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		224	},
		225	);
		226	}
		227
		228	sub set_invisible {
		229	my ($self) = @_;
		230
		231	# broken show/hide model
		232
		233	delete $self->{visible};
209		234
210	undef $GRAB if $GRAB == $self;	235	undef $GRAB if $GRAB == $self;
211	undef $HOVER if $HOVER == $self;	236	undef $HOVER if $HOVER == $self;
		237
		238	CFClient::UI::check_tooltip
		239	if $CFClient::UI::TOOLTIP->{owner} == $self;
		240
		241	$self->focus_out;
		242	}
		243
		244	sub hide {
		245	my ($self) = @_;
		246
		247	$self->set_invisible;
212		248
213	$self->{parent}->remove ($self)	249	$self->{parent}->remove ($self)
214	if $self->{parent};	250	if $self->{parent};
215	}	251	}
216		252
…		…
283		319
284	delete $self->{max_w}; $self->{max_w} = $w if $w;	320	delete $self->{max_w}; $self->{max_w} = $w if $w;
285	delete $self->{max_h}; $self->{max_h} = $h if $h;	321	delete $self->{max_h}; $self->{max_h} = $h if $h;
286	}	322	}
287		323
		324	sub set_tooltip {
		325	my ($self, $tooltip) = @_;
		326
		327	$tooltip =~ s/^\s+//;
		328	$tooltip =~ s/\s+$//;
		329
		330	return if $self->{tooltip} eq $tooltip;
		331
		332	$self->{tooltip} = $tooltip;
		333
		334	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		335	delete $CFClient::UI::TOOLTIP->{owner};
		336	CFClient::UI::check_tooltip;
		337	}
		338	}
		339
288	# translate global coordinates to local coordinate system	340	# translate global coordinates to local coordinate system
289	sub coord2local {	341	sub coord2local {
290	my ($self, $x, $y) = @_;	342	my ($self, $x, $y) = @_;
291		343
292	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	344	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
…		…
305	return if $FOCUS == $self;	357	return if $FOCUS == $self;
306	return unless $self->{can_focus};	358	return unless $self->{can_focus};
307		359
308	my $focus = $FOCUS; $FOCUS = $self;	360	my $focus = $FOCUS; $FOCUS = $self;
309		361
310	$self->emit (focus_in => $focus);	362	$self->_emit (focus_in => $focus);
311		363
312	$focus->update if $focus;	364	$focus->update if $focus;
313	$FOCUS->update;	365	$FOCUS->update;
314	}	366	}
315		367
…		…
318		370
319	return unless $FOCUS == $self;	371	return unless $FOCUS == $self;
320		372
321	my $focus = $FOCUS; undef $FOCUS;	373	my $focus = $FOCUS; undef $FOCUS;
322		374
323	$self->emit (focus_out => $focus);	375	$self->_emit (focus_out => $focus);
324		376
325	$focus->update if $focus; #?	377	$focus->update if $focus; #?
		378
		379	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		380	unless $FOCUS;
326	}	381	}
327		382
328	sub mouse_motion { }	383	sub mouse_motion { }
329	sub button_up { }	384	sub button_up { }
330	sub key_down { }	385	sub key_down { }
331	sub key_up { }	386	sub key_up { }
332		387
333	sub button_down {	388	sub button_down {
334	my ($self, $ev, $x, $y) = @_;	389	my ($self, $ev, $x, $y) = @_;
335		390
336	$self->focus_in;	391	$self->focus_in;
…		…
370	if ($ENV{PCLIENT_DEBUG}) {	425	if ($ENV{PCLIENT_DEBUG}) {
371	glPushMatrix;	426	glPushMatrix;
372	glColor 1, 1, 0, 1;	427	glColor 1, 1, 0, 1;
373	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374	glBegin GL_LINE_LOOP;	429	glBegin GL_LINE_LOOP;
375	glVertex 0 , 0;	430	glVertex 0 , 0;
376	glVertex $self->{w}, 0;	431	glVertex $self->{w} - 1, 0;
377	glVertex $self->{w}, $self->{h};	432	glVertex $self->{w} - 1, $self->{h} - 1;
378	glVertex 0 , $self->{h};	433	glVertex 0 , $self->{h} - 1;
379	glEnd;	434	glEnd;
380	glPopMatrix;	435	glPopMatrix;
381	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	436	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382	}	437	}
383	}	438	}
384		439
385	sub _draw {	440	sub _draw {
386	my ($self) = @_;	441	my ($self) = @_;
…		…
403	sub set_parent {	458	sub set_parent {
404	my ($self, $parent) = @_;	459	my ($self, $parent) = @_;
405		460
406	Scalar::Util::weaken ($self->{parent} = $parent);	461	Scalar::Util::weaken ($self->{parent} = $parent);
407		462
		463	$self->{root} = $parent->{root};
		464	$self->{visible} = $parent->{visible};
		465
408	# TODO: req_w _does_change after ->reconfigure	466	# TODO: req_w _does_change after ->reconfigure
409	$self->check_size	467	$self->check_size
410	unless exists $self->{req_w};	468	unless exists $self->{req_w};
		469
		470	$self->show;
411	}	471	}
412		472
413	sub check_size {	473	sub check_size {
414	my ($self, $forced) = @_;	474	my ($self, $forced) = @_;
415		475
…		…
428	my ($self, $signal, $cb) = @_;	488	my ($self, $signal, $cb) = @_;
429		489
430	push @{ $self->{signal_cb}{$signal} }, $cb;	490	push @{ $self->{signal_cb}{$signal} }, $cb;
431	}	491	}
432		492
		493	sub _emit {
		494	my ($self, $signal, @args) = @_;
		495
		496	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		497	}
		498
433	sub emit {	499	sub emit {
434	my ($self, $signal, @args) = @_;	500	my ($self, $signal, @args) = @_;
435		501
436	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	502	$self->_emit ($signal, @args)
		503	|| $self->$signal (@args);
437	}	504	}
438		505
439	sub DESTROY {	506	sub DESTROY {
440	my ($self) = @_;	507	my ($self) = @_;
441		508
…		…
456	my $class = shift;	523	my $class = shift;
457		524
458	# range [value, low, high, page]	525	# range [value, low, high, page]
459		526
460	$class->SUPER::new (	527	$class->SUPER::new (
461	bg => [0, 0, 0, 0.2],	528	#bg => [0, 0, 0, 0.2],
462	active_bg => [1, 1, 1, 0.5],	529	#active_bg => [1, 1, 1, 0.5],
463	@_	530	@_
464	)	531	)
465	}	532	}
466		533
467	sub _draw {	534	sub _draw {
468	my ($self) = @_;	535	my ($self) = @_;
469		536
		537	my $color = $FOCUS == $self && $self->{active_bg}
		538	? $self->{active_bg}
		539	: $self->{bg};
		540
		541	if ($color && (@$color < 4 || $color->[3])) {
470	my ($w, $h) = @$self{qw(w h)};	542	my ($w, $h) = @$self{qw(w h)};
471		543
472	glEnable GL_BLEND;	544	glEnable GL_BLEND;
473	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	545	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	546	glColor @$color;
475		547
476	glBegin GL_QUADS;	548	glBegin GL_QUADS;
477	glVertex 0 , 0;	549	glVertex 0 , 0;
478	glVertex 0 , $h;	550	glVertex 0 , $h;
479	glVertex $w, $h;	551	glVertex $w, $h;
480	glVertex $w, 0;	552	glVertex $w, 0;
481	glEnd;	553	glEnd;
482		554
483	glDisable GL_BLEND;	555	glDisable GL_BLEND;
		556	}
484	}	557	}
485		558
486	#############################################################################	559	#############################################################################
487		560
488	package CFClient::UI::Empty;	561	package CFClient::UI::Empty;
…		…
548	delete $child->{parent};	621	delete $child->{parent};
549	$child->hide;	622	$child->hide;
550		623
551	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	624	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
552		625
553	$self->check_size;	626	$self->check_size (1);
554	$self->update;	627	$self->update;
555	}	628	}
556		629
557	sub clear {	630	sub clear {
558	my ($self) = @_;	631	my ($self) = @_;
…		…
672	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	745	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673	glClearColor 0, 0, 0, 0;	746	glClearColor 0, 0, 0, 0;
674	glClear GL_COLOR_BUFFER_BIT;	747	glClear GL_COLOR_BUFFER_BIT;
675		748
676	$self->_render;	749	$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	};	750	};
685	}	751	}
686		752
687	sub _draw {	753	sub _draw {
688	my ($self) = @_;	754	my ($self) = @_;
…		…
692	my $tex = $self->{texture}	758	my $tex = $self->{texture}
693	or return;	759	or return;
694		760
695	glEnable GL_TEXTURE_2D;	761	glEnable GL_TEXTURE_2D;
696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	762	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697	glColor 0, 0, 0, 1;	763	glColor 1, 1, 1, 1;
698		764
699	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	765	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
700		766
701	glDisable GL_TEXTURE_2D;	767	glDisable GL_TEXTURE_2D;
702	}	768	}
…		…
705		771
706	package CFClient::UI::ViewPort;	772	package CFClient::UI::ViewPort;
707		773
708	our @ISA = CFClient::UI::Window::;	774	our @ISA = CFClient::UI::Window::;
709		775
		776	sub new {
		777	my $class = shift;
		778
		779	$class->SUPER::new (
		780	scroll_x => 0,
		781	scroll_y => 1,
		782	@_,
		783	)
		784	}
		785
710	sub size_request {	786	sub size_request {
711	my ($self) = @_;	787	my ($self) = @_;
712		788
713	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	789	@$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		790
716	@$self{qw(child_w child_h)}	791	@$self{qw(child_w child_h)}
717	}	792	}
718		793
719	sub size_allocate {	794	sub size_allocate {
720	my ($self, $w, $h) = @_;	795	my ($self, $w, $h) = @_;
721		796
		797	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		798	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		799
		800	$self->child->configure (0, 0, $w, $h);
722	$self->update;	801	$self->update;
723	}	802	}
724		803
725	sub set_offset {	804	sub set_offset {
726	my ($self, $x, $y) = @_;	805	my ($self, $x, $y) = @_;
…		…
780		859
781	my $slider = new CFClient::UI::Slider	860	my $slider = new CFClient::UI::Slider
782	vertical => 1,	861	vertical => 1,
783	range => [0, 0, 1, 0.01], # HACK fix	862	range => [0, 0, 1, 0.01], # HACK fix
784	connect_changed => sub {	863	connect_changed => sub {
785	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	864	$self->{vp}->set_offset (0, $_[1]);
786	},	865	},
787	;	866	;
788		867
789	$self = $class->SUPER::new (	868	$self = $class->SUPER::new (
790	vp => (new CFClient::UI::ViewPort),	869	vp => (new CFClient::UI::ViewPort expand => 1),
791	slider => $slider,	870	slider => $slider,
792	@_,	871	@_,
793	);	872	);
794		873
795	$self->{vp}->add ($self->{scrolled});	874	$self->{vp}->add ($self->{scrolled});
796	$self->add ($self->{vp});	875	$self->add ($self->{vp});
797	$self->add ($self->{slider});	876	$self->add ($self->{slider});
798		877
799	$self	878	$self
		879	}
		880
		881	sub size_allocate {
		882	my ($self, $w, $h) = @_;
		883
		884	$self->SUPER::size_allocate ($w, $h);
		885
		886	my $child = $self->{vp}->child;
		887	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
800	}	888	}
801		889
802	#TODO# update range on size_allocate depending on child	890	#TODO# update range on size_allocate depending on child
803	# update viewport offset on scroll	891	# update viewport offset on scroll
804		892
…		…
858	my $class = shift;	946	my $class = shift;
859		947
860	# TODO: user_x, user_y, overwrite moveto?	948	# TODO: user_x, user_y, overwrite moveto?
861		949
862	my $self = $class->SUPER::new (	950	my $self = $class->SUPER::new (
863	bg => [1, 1, 1, 1],	951	bg => [1, 1, 1, 1],
864	border_bg => [1, 1, 1, 1],	952	border_bg => [1, 1, 1, 1],
865	border => 0.6,	953	border => 0.6,
866	toplevel => 1,	954	is_toplevel => 1,
867	can_events => 1,	955	can_events => 1,
868	@_	956	@_
869	);	957	);
870		958
871	$self->{title} &&= new CFClient::UI::Label	959	$self->{title} &&= new CFClient::UI::Label
872	align => 0,	960	align => 0,
…		…
896	my ($self, $w, $h) = @_;	984	my ($self, $w, $h) = @_;
897		985
898	$h -= List::Util::max 0, $self->border * 2;	986	$h -= List::Util::max 0, $self->border * 2;
899	$w -= List::Util::max 0, $self->border * 2;	987	$w -= List::Util::max 0, $self->border * 2;
900		988
901	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	989	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
902	if $self->{title};	990	if $self->{title};
903		991
904	$self->child->configure ($self->border, $self->border, $w, $h);	992	$self->child->configure ($self->border, $self->border, $w, $h);
905	}	993	}
906		994
…		…
1012	sub new {	1100	sub new {
1013	my $class = shift;	1101	my $class = shift;
1014		1102
1015	$class->SUPER::new (	1103	$class->SUPER::new (
1016	col_expand => [],	1104	col_expand => [],
1017	@_	1105	@_,
1018	)	1106	)
		1107	}
		1108
		1109	sub children {
		1110	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019	}	1111	}
1020		1112
1021	sub add {	1113	sub add {
1022	my ($self, $x, $y, $child) = @_;	1114	my ($self, $x, $y, $child) = @_;
1023		1115
1024	$child->set_parent ($self);	1116	$child->set_parent ($self);
1025	$self->{children}[$y][$x] = $child;	1117	$self->{children}[$y][$x] = $child;
1026		1118
1027	$child->check_size;	1119	$self->check_size (1);
1028	}	1120	}
1029		1121
1030	sub children {
1031	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032	}
1033
1034	# TODO: move to container class maybe? send childs a signal on removal?	1122	# TODO: move to container class maybe? send children a signal on removal?
1035	sub clear {	1123	sub clear {
1036	my ($self) = @_;	1124	my ($self) = @_;
1037		1125
1038	my @children = $self->children;	1126	my @children = $self->children;
1039	delete $self->{children};	1127	delete $self->{children};
…		…
1041	for (@children) {	1129	for (@children) {
1042	delete $_->{parent};	1130	delete $_->{parent};
1043	$_->hide;	1131	$_->hide;
1044	}	1132	}
1045		1133
		1134	$self->check_size (1);
1046	$self->update;	1135	$self->update;
1047	}	1136	}
1048		1137
1049	sub get_wh {	1138	sub get_wh {
1050	my ($self) = @_;	1139	my ($self) = @_;
…		…
1082	sub size_allocate {	1171	sub size_allocate {
1083	my ($self, $w, $h) = @_;	1172	my ($self, $w, $h) = @_;
1084		1173
1085	my ($ws, $hs) = $self->get_wh;	1174	my ($ws, $hs) = $self->get_wh;
1086		1175
1087	my $req_w = sum @$ws;	1176	my $req_w = (sum @$ws) || 1;
1088	my $req_h = sum @$hs;	1177	my $req_h = (sum @$hs) || 1;
1089		1178
1090	# TODO: nicer code && do row_expand	1179	# TODO: nicer code && do row_expand
1091	my @col_expand = @{$self->{col_expand}};	1180	my @col_expand = @{$self->{col_expand}};
1092	@col_expand = (1) x @$ws unless @col_expand;	1181	@col_expand = (1) x @$ws unless @col_expand;
1093	my $col_expand = (sum @col_expand) || 1;	1182	my $col_expand = (sum @col_expand) || 1;
…		…
1267		1356
1268	#############################################################################	1357	#############################################################################
1269		1358
1270	package CFClient::UI::Label;	1359	package CFClient::UI::Label;
1271		1360
1272	our @ISA = CFClient::UI::Base::;	1361	our @ISA = CFClient::UI::DrawBG::;
1273		1362
1274	use CFClient::OpenGL;	1363	use CFClient::OpenGL;
1275		1364
1276	sub new {	1365	sub new {
1277	my ($class, %arg) = @_;	1366	my ($class, %arg) = @_;
1278		1367
1279	my $self = $class->SUPER::new (	1368	my $self = $class->SUPER::new (
1280	fg => [1, 1, 1],	1369	fg => [1, 1, 1],
		1370	#bg => none
		1371	#active_bg => none
1281	#font => default_font	1372	#font => default_font
1282	#text => initial text	1373	#text => initial text
1283	#markup => initial narkup	1374	#markup => initial narkup
		1375	#max_w => maximum pixel width
		1376	ellipsise => 3, # end
1284	layout => (new CFClient::Layout),	1377	layout => (new CFClient::Layout),
1285	fontsize => 1,	1378	fontsize => 1,
1286	align => -1,	1379	align => -1,
1287	valign => -1,	1380	valign => -1,
1288	padding => 2,	1381	padding => 2,
…		…
1303	}	1396	}
1304		1397
1305	$self	1398	$self
1306	}	1399	}
1307		1400
1308	sub escape {	1401	sub escape($) {
1309	local $_ = $_[1];	1402	local $_ = $_[0];
1310		1403
1311	s/&/&amp;/g;	1404	s/&/&amp;/g;
1312	s/>/&gt;/g;	1405	s/>/&gt;/g;
1313	s/</&lt;/g;	1406	s/</&lt;/g;
1314		1407
1315	$_[1]	1408	$_
1316	}	1409	}
1317		1410
1318	sub update {	1411	sub update {
1319	my ($self) = @_;	1412	my ($self) = @_;
1320		1413
…		…
1353	sub size_request {	1446	sub size_request {
1354	my ($self) = @_;	1447	my ($self) = @_;
1355		1448
1356	$self->{layout}->set_font ($self->{font}) if $self->{font};	1449	$self->{layout}->set_font ($self->{font}) if $self->{font};
1357	$self->{layout}->set_width ($self->{max_w} || -1);	1450	$self->{layout}->set_width ($self->{max_w} || -1);
		1451	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1452	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1453	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359		1454
1360	my ($w, $h) = $self->{layout}->size;	1455	my ($w, $h) = $self->{layout}->size;
1361		1456
1362	if (exists $self->{template}) {	1457	if (exists $self->{template}) {
…		…
1392	}	1487	}
1393		1488
1394	sub _draw {	1489	sub _draw {
1395	my ($self) = @_;	1490	my ($self) = @_;
1396		1491
		1492	$self->SUPER::_draw; # draw background, if applicable
		1493
1397	my $tex = $self->{texture} ||= do {	1494	my $tex = $self->{texture} ||= do {
1398	$self->{layout}->set_foreground (@{$self->{fg}});	1495	$self->{layout}->set_foreground (@{$self->{fg}});
1399	$self->{layout}->set_font ($self->{font}) if $self->{font};	1496	$self->{layout}->set_font ($self->{font}) if $self->{font};
1400	$self->{layout}->set_width ($self->{w});	1497	$self->{layout}->set_width ($self->{w});
		1498	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1499	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1500	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402		1501
1403	my $tex = new_from_layout CFClient::Texture $self->{layout};	1502	my $tex = new_from_layout CFClient::Texture $self->{layout};
1404		1503
1405	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1504	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1406	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1505	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407	: ($self->{w} - $tex->{w}) * 0.5;	1506	: ($self->{w} - $tex->{w}) * 0.5);
1408		1507
1409	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1508	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1410	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1509	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411	: ($self->{h} - $tex->{h}) * 0.5;	1510	: ($self->{h} - $tex->{h}) * 0.5);
1412		1511
1413	$tex	1512	$tex
1414	};	1513	};
1415		1514
1416	glEnable GL_TEXTURE_2D;	1515	glEnable GL_TEXTURE_2D;
…		…
1444	active_fg => [0, 0, 0],	1543	active_fg => [0, 0, 0],
1445	can_hover => 1,	1544	can_hover => 1,
1446	can_focus => 1,	1545	can_focus => 1,
1447	valign => 0,	1546	valign => 0,
1448	can_events => 1,	1547	can_events => 1,
		1548	#text => ...
1449	@_	1549	@_
1450	)	1550	)
1451	}	1551	}
1452		1552
1453	sub _set_text {	1553	sub _set_text {
…		…
1463	$self->{text} = $text;	1563	$self->{text} = $text;
1464		1564
1465	$text =~ s/./*/g if $self->{hidden};	1565	$text =~ s/./*/g if $self->{hidden};
1466	$self->{layout}->set_text ("$text ");	1566	$self->{layout}->set_text ("$text ");
1467		1567
1468	$self->emit (changed => $self->{text});	1568	$self->_emit (changed => $self->{text});
1469	}	1569	}
1470		1570
1471	sub set_text {	1571	sub set_text {
1472	my ($self, $text) = @_;	1572	my ($self, $text) = @_;
1473		1573
1474	$self->{cursor} = length $text;	1574	$self->{cursor} = length $text;
1475	$self->_set_text ($text);	1575	$self->_set_text ($text);
		1576	$self->update;
1476	$self->check_size;	1577	$self->check_size;
1477	$self->update;
1478	}	1578	}
1479		1579
1480	sub get_text {	1580	sub get_text {
1481	$_[0]{text}	1581	$_[0]{text}
1482	}	1582	}
…		…
1485	my ($self) = @_;	1585	my ($self) = @_;
1486		1586
1487	my ($w, $h) = $self->SUPER::size_request;	1587	my ($w, $h) = $self->SUPER::size_request;
1488		1588
1489	($w + 1, $h) # add 1 for cursor	1589	($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	}	1590	}
1497		1591
1498	sub key_down {	1592	sub key_down {
1499	my ($self, $ev) = @_;	1593	my ($self, $ev) = @_;
1500		1594
…		…
1515	} elsif ($sym == CFClient::SDLK_HOME) {	1609	} elsif ($sym == CFClient::SDLK_HOME) {
1516	$self->{cursor} = 0;	1610	$self->{cursor} = 0;
1517	} elsif ($sym == CFClient::SDLK_END) {	1611	} elsif ($sym == CFClient::SDLK_END) {
1518	$self->{cursor} = length $text;	1612	$self->{cursor} = length $text;
1519	} elsif ($uni == 27) {	1613	} elsif ($uni == 27) {
1520	$self->emit ('escape');	1614	$self->_emit ('escape');
1521	} elsif ($uni) {	1615	} elsif ($uni) {
1522	substr $text, $self->{cursor}++, 0, chr $uni;	1616	substr $text, $self->{cursor}++, 0, chr $uni;
1523	}	1617	}
1524		1618
1525	$self->_set_text ($text);	1619	$self->_set_text ($text);
1526	$self->update;	1620	$self->update;
		1621	$self->check_size;
1527	}	1622	}
1528		1623
1529	sub focus_in {	1624	sub focus_in {
1530	my ($self) = @_;	1625	my ($self) = @_;
1531		1626
…		…
1611	if ($sym == 13) {	1706	if ($sym == 13) {
1612	unshift @{$self->{history}},	1707	unshift @{$self->{history}},
1613	my $txt = $self->get_text;	1708	my $txt = $self->get_text;
1614	$self->{history_pointer} = -1;	1709	$self->{history_pointer} = -1;
1615	$self->{history_saveback} = '';	1710	$self->{history_saveback} = '';
1616	$self->emit (activate => $txt);	1711	$self->_emit (activate => $txt);
1617	$self->update;	1712	$self->update;
1618		1713
1619	} elsif ($sym == CFClient::SDLK_UP) {	1714	} elsif ($sym == CFClient::SDLK_UP) {
1620	if ($self->{history_pointer} < 0) {	1715	if ($self->{history_pointer} < 0) {
1621	$self->{history_saveback} = $self->get_text;	1716	$self->{history_saveback} = $self->get_text;
…		…
1660	my $class = shift;	1755	my $class = shift;
1661		1756
1662	$class->SUPER::new (	1757	$class->SUPER::new (
1663	padding => 4,	1758	padding => 4,
1664	fg => [1, 1, 1],	1759	fg => [1, 1, 1],
1665	bg => [1, 1, 1, 0.2],
1666	active_fg => [0, 0, 1],	1760	active_fg => [0, 0, 1],
1667	can_hover => 1,	1761	can_hover => 1,
1668	align => 0,	1762	align => 0,
1669	valign => 0,	1763	valign => 0,
1670	can_events => 1,	1764	can_events => 1,
1671	@_	1765	@_
1672	)	1766	)
1673	}	1767	}
1674		1768
		1769	sub activate { }
		1770
1675	sub button_up {	1771	sub button_up {
1676	my ($self, $ev, $x, $y) = @_;	1772	my ($self, $ev, $x, $y) = @_;
1677		1773
		1774	$self->emit ("activate")
1678	if ($x >= 0 && $x < $self->{w}	1775	if $x >= 0 && $x < $self->{w}
1679	&& $y >= 0 && $y < $self->{h}) {	1776	&& $y >= 0 && $y < $self->{h};
1680	$self->emit ("activate");
1681	}
1682	}	1777	}
1683		1778
1684	sub _draw {	1779	sub _draw {
1685	my ($self) = @_;	1780	my ($self) = @_;
1686		1781
…		…
1718		1813
1719	$class->SUPER::new (	1814	$class->SUPER::new (
1720	padding => 2,	1815	padding => 2,
1721	fg => [1, 1, 1],	1816	fg => [1, 1, 1],
1722	active_fg => [1, 1, 0],	1817	active_fg => [1, 1, 0],
		1818	bg => [0, 0, 0, 0.2],
		1819	active_bg => [1, 1, 1, 0.5],
1723	state => 0,	1820	state => 0,
1724	can_hover => 1,	1821	can_hover => 1,
1725	@_	1822	@_
1726	)	1823	)
1727	}	1824	}
…		…
1736	my ($self, $ev, $x, $y) = @_;	1833	my ($self, $ev, $x, $y) = @_;
1737		1834
1738	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1835	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1739	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1836	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1740	$self->{state} = !$self->{state};	1837	$self->{state} = !$self->{state};
1741	$self->emit (changed => $self->{state});	1838	$self->_emit (changed => $self->{state});
1742	}	1839	}
1743	}	1840	}
1744		1841
1745	sub _draw {	1842	sub _draw {
1746	my ($self) = @_;	1843	my ($self) = @_;
…		…
2011	qw(s1_slider.png s1_slider_bg.png);	2108	qw(s1_slider.png s1_slider_bg.png);
2012		2109
2013	sub new {	2110	sub new {
2014	my $class = shift;	2111	my $class = shift;
2015		2112
2016	# range [value, low, high, page]	2113	# range [value, low, high, page, unit]
2017		2114
2018	# TODO: 0-width page	2115	# TODO: 0-width page
2019	# TODO: req_w/h are wrong with vertical	2116	# TODO: req_w/h are wrong with vertical
2020	# TODO: calculations are off	2117	# TODO: calculations are off
2021	my $self = $class->SUPER::new (	2118	my $self = $class->SUPER::new (
2022	fg => [1, 1, 1],	2119	fg => [1, 1, 1],
2023	active_fg => [0, 0, 0],	2120	active_fg => [0, 0, 0],
		2121	bg => [0, 0, 0, 0.2],
		2122	active_bg => [1, 1, 1, 0.5],
2024	range => [0, 0, 100, 10],	2123	range => [0, 0, 100, 10, 0],
2025	req_w => $::WIDTH / 80,	2124	req_w => $::WIDTH / 80,
2026	req_h => $::WIDTH / 80,	2125	req_h => $::WIDTH / 80,
2027	vertical => 0,	2126	vertical => 0,
2028	can_hover => 1,	2127	can_hover => 1,
2029	inner_pad => 5,	2128	inner_pad => 0.02,
2030	@_	2129	@_
2031	);	2130	);
2032		2131
		2132	$self->set_value ($self->{range}[0]);
		2133	$self->update;
		2134
2033	$self	2135	$self
		2136	}
		2137
		2138	sub set_range {
		2139	my ($self, $range) = @_;
		2140
		2141	$self->{range} = $range;
		2142
		2143	$self->update;
		2144	}
		2145
		2146	sub set_value {
		2147	my ($self, $value) = @_;
		2148
		2149	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2150
		2151	$hi = $lo + 1 if $hi <= $lo;
		2152
		2153	$page = $hi - $lo if $page > $hi - $lo;
		2154
		2155	$value = $lo if $value < $lo;
		2156	$value = $hi - $page if $value > $hi - $page;
		2157
		2158	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2159	if $unit;
		2160
		2161	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2162
		2163	if ($value != $old_value) {
		2164	$self->_emit (changed => $value);
		2165	$self->update;
		2166	}
2034	}	2167	}
2035		2168
2036	sub size_request {	2169	sub size_request {
2037	my ($self) = @_;	2170	my ($self) = @_;
2038		2171
…		…
2044		2177
2045	sub button_down {	2178	sub button_down {
2046	my ($self, $ev, $x, $y) = @_;	2179	my ($self, $ev, $x, $y) = @_;
2047		2180
2048	$self->SUPER::button_down ($ev, $x, $y);	2181	$self->SUPER::button_down ($ev, $x, $y);
		2182
		2183	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2184
2049	$self->mouse_motion ($ev, $x, $y);	2185	$self->mouse_motion ($ev, $x, $y);
2050	}	2186	}
2051		2187
2052	sub mouse_motion {	2188	sub mouse_motion {
2053	my ($self, $ev, $x, $y) = @_;	2189	my ($self, $ev, $x, $y) = @_;
2054		2190
2055	if ($GRAB == $self) {	2191	if ($GRAB == $self) {
		2192	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2193
		2194	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2195
		2196	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2197
		2198	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2199	}
		2200	}
		2201
		2202	sub update {
		2203	my ($self) = @_;
		2204
		2205	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2206	$self->set_value ($self->{range}[0]);
		2207
2056	my ($value, $lo, $hi, $page) = @{$self->{range}};	2208	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2209	my $range = ($hi - $page - $lo) || 1e-100;
2057		2210
2058	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2211	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059		2212
2060	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2213	$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	2214	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062		2215
2063	$x -= $inner_pad_px; # substract the padding	2216	$value = ($value - $lo) / $range;
2064	$x = $x * ($hi - $lo) / $inner_w + $lo;	2217	$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		2218
2069	$self->emit (changed => $x);	2219	$self->{knob_x} = $value - $knob_w * 0.5;
2070	$self->update;	2220	$self->{knob_w} = $knob_w;
2071	}	2221	});
2072	}
2073		2222
2074	# the inner_* stuff is for generating a padding for the slider handle,	2223	$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	}	2224	}
2081		2225
2082	sub _draw {	2226	sub _draw {
2083	my ($self) = @_;	2227	my ($self) = @_;
2084		2228
2085	$self->SUPER::_draw ();	2229	$self->SUPER::_draw ();
2086		2230
2087	my ($w, $h) = @$self{qw(w h)};	2231	glScale $self->{w}, $self->{h};
2088		2232
2089	if ($self->{vertical}) {	2233	if ($self->{vertical}) {
2090	# draw a vertical slider like a rotated horizontal slider	2234	# draw a vertical slider like a rotated horizontal slider
2091		2235
		2236	glTranslate 1, 0, 0;
2092	glRotate 90, 0, 0, 1;	2237	glRotate 90, 0, 0, 1;
2093	glTranslate 0, -$self->{w}, 0;
2094
2095	($w, $h) = ($h, $w);
2096	}	2238	}
2097		2239
2098	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2240	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2241	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100		2242
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;	2243	glEnable GL_TEXTURE_2D;
2120	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2244	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121		2245
2122	# draw background	2246	# draw background
2123	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2247	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124		2248
2125	# draw handle	2249	# draw handle
2126	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2250	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127		2251
2128	glDisable GL_TEXTURE_2D;	2252	glDisable GL_TEXTURE_2D;
2129	}	2253	}
		2254
		2255	#############################################################################
		2256
		2257	package CFClient::UI::ValSlider;
		2258
		2259	our @ISA = CFClient::UI::HBox::;
		2260
		2261	sub new {
		2262	my ($class, %arg) = @_;
		2263
		2264	my $range = delete $arg{range};
		2265
		2266	my $self = $class->SUPER::new (
		2267	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2268	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2269	to_value => sub { shift },
		2270	from_value => sub { shift },
		2271	%arg,
		2272	);
		2273
		2274	$self->{slider}->connect (changed => sub {
		2275	my ($self, $value) = @_;
		2276	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2277	$self->{parent}->emit (changed => $value);
		2278	});
		2279
		2280	# $self->{entry}->connect (changed => sub {
		2281	# my ($self, $value) = @_;
		2282	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2283	# $self->{parent}->emit (changed => $value);
		2284	# });
		2285
		2286	$self->add ($self->{slider}, $self->{entry});
		2287
		2288	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2289
		2290	$self
		2291	}
		2292
		2293	sub set_range { shift->{slider}->set_range (@_) }
		2294	sub set_value { shift->{slider}->set_value (@_) }
2130		2295
2131	#############################################################################	2296	#############################################################################
2132		2297
2133	package CFClient::UI::TextView;	2298	package CFClient::UI::TextView;
2134		2299
…		…
2164		2329
2165	$self->{fontsize} = $fontsize;	2330	$self->{fontsize} = $fontsize;
2166	$self->reflow;	2331	$self->reflow;
2167	}	2332	}
2168		2333
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 {	2334	sub size_allocate {
2189	my ($self, $w, $h) = @_;	2335	my ($self, $w, $h) = @_;
2190		2336
2191	$self->SUPER::size_allocate ($w, $h);	2337	$self->SUPER::size_allocate ($w, $h);
2192		2338
…		…
2195	$self->{layout}->set_width ($self->{children}[0]{w});	2341	$self->{layout}->set_width ($self->{children}[0]{w});
2196		2342
2197	$self->reflow;	2343	$self->reflow;
2198	}	2344	}
2199		2345
		2346	sub text_size {
		2347	my ($self, $text, $indent) = @_;
		2348
		2349	my $layout = $self->{layout};
		2350
		2351	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2352	$layout->set_width ($self->{children}[0]{w} - $indent);
		2353	$layout->set_markup ($text);
		2354
		2355	$layout->size
		2356	}
		2357
		2358	sub reflow {
		2359	my ($self) = @_;
		2360
		2361	$self->{need_reflow}++;
		2362	$self->update;
		2363	}
		2364
		2365	sub set_offset {
		2366	my ($self, $offset) = @_;
		2367
		2368	# todo: base offset on lines or so, not on pixels
		2369	$self->{children}[1]->set_value ($offset);
		2370	}
		2371
		2372	sub clear {
		2373	my ($self) = @_;
		2374
		2375	$self->{par} = [];
		2376	$self->{height} = 0;
		2377	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2378	}
		2379
2200	sub add_paragraph {	2380	sub add_paragraph {
2201	my ($self, $color, $text) = @_;	2381	my ($self, $color, $text, $indent) = @_;
2202		2382
2203	#TODO: intelligently "reformat" paragraph	2383	for my $line (split /\n/, $text) {
2204		2384	my ($w, $h) = $self->text_size ($line);
2205	my $height = $self->text_height ($text);
2206
2207	$self->{height} += $height;	2385	$self->{height} += $h;
		2386	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2387	}
2208		2388
2209	push @{$self->{par}}, [$height, $color, $text];
2210
2211	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2389	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2212	$self->{children}[1]->update;
2213	}	2390	}
2214		2391
2215	sub update {	2392	sub update {
2216	my ($self) = @_;	2393	my ($self) = @_;
2217		2394
…		…
2220	return unless $self->{h} > 0;	2397	return unless $self->{h} > 0;
2221		2398
2222	delete $self->{texture};	2399	delete $self->{texture};
2223		2400
2224	$ROOT->on_post_alloc ($self, sub {	2401	$ROOT->on_post_alloc ($self, sub {
		2402	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2403
2225	if (delete $self->{need_reflow}) {	2404	if (delete $self->{need_reflow}) {
2226	my $height = 0;	2405	my $height = 0;
2227		2406
2228	$height += $_->[0] = $self->text_height ($_->[2])	2407	my $layout = $self->{layout};
		2408
		2409	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2410
2229	for @{$self->{par}};	2411	for (@{$self->{par}}) {
		2412	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2413	$layout->set_width ($W - $_->[3]);
		2414	$layout->set_markup ($_->[4]);
		2415	my ($w, $h) = $layout->size;
		2416	$_->[0] = $w + $_->[3];
		2417	$_->[1] = $h;
		2418	}
		2419
		2420	$height += $_->[1];
		2421	}
2230		2422
2231	$self->{height} = $height;	2423	$self->{height} = $height;
2232		2424
2233	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2425	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234		2426
2235	delete $self->{texture};	2427	delete $self->{texture};
2236	}	2428	}
2237		2429
2238	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2430	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2239	glClearColor 0, 0, 0, 0;	2431	glClearColor 0.5, 0.5, 0.5, 0;
2240	glClear GL_COLOR_BUFFER_BIT;	2432	glClear GL_COLOR_BUFFER_BIT;
2241		2433
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];	2434	my $top = int $self->{children}[1]{range}[0];
2246		2435
2247	my $y0 = $top;	2436	my $y0 = $top;
2248	my $y1 = $top + $self->{h};	2437	my $y1 = $top + $H;
2249		2438
2250	my $y = 0;	2439	my $y = 0;
2251		2440
2252	my $layout = $self->{layout};	2441	my $layout = $self->{layout};
2253		2442
2254	$layout->set_font ($self->{font}) if $self->{font};	2443	$layout->set_font ($self->{font}) if $self->{font};
2255		2444
		2445	glEnable GL_BLEND;
		2446	#TODO# not correct in windows where rgba is forced off
		2447	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2448
2256	for my $par (@{$self->{par}}) {	2449	for my $par (@{$self->{par}}) {
2257	my $h = $par->[0];	2450	my $h = $par->[1];
2258		2451
2259	if ($y0 < $y + $h && $y < $y1) {	2452	if ($y0 < $y + $h && $y < $y1) {
2260	$layout->set_foreground (@{ $par->[1] });	2453	$layout->set_foreground (@{ $par->[2] });
		2454	$layout->set_width ($W - $par->[3]);
2261	$layout->set_markup ($par->[2]);	2455	$layout->set_markup ($par->[4]);
2262		2456
2263	my ($W, $H) = $layout->size;	2457	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2458
		2459	glRasterPos $par->[3], $y - $y0;
		2460	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265	}	2461	}
2266		2462
2267	$y += $h;	2463	$y += $h;
2268	}	2464	}
2269		2465
2270	glDisable GL_TEXTURE_2D;	2466	glDisable GL_BLEND;
2271	};	2467	};
2272	});	2468	});
2273	}	2469	}
2274		2470
2275	sub _draw {	2471	sub _draw {
2276	my ($self) = @_;	2472	my ($self) = @_;
2277		2473
2278	glEnable GL_TEXTURE_2D;	2474	glEnable GL_TEXTURE_2D;
2279	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2475	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280	glColor 1, 1, 1, 1;	2476	glColor 1, 1, 1, 1;
2281	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2477	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282	glDisable GL_TEXTURE_2D;	2478	glDisable GL_TEXTURE_2D;
2283		2479
2284	$self->{children}[1]->draw;	2480	$self->{children}[1]->draw;
2285		2481
2286	}	2482	}
…		…
2355		2551
2356	# TODO: use animation	2552	# TODO: use animation
2357	if ($self->{state} = !$self->{state}) {	2553	if ($self->{state} = !$self->{state}) {
2358	$CFClient::UI::ROOT->add ($self->{other});	2554	$CFClient::UI::ROOT->add ($self->{other});
2359	$self->{other}->move ($self->coord2global (0, $self->{h}));	2555	$self->{other}->move ($self->coord2global (0, $self->{h}));
2360	$self->emit ("open");	2556	$self->_emit ("open");
2361	} else {	2557	} else {
2362	$CFClient::UI::ROOT->remove ($self->{other});	2558	$CFClient::UI::ROOT->remove ($self->{other});
2363	$self->emit ("close");	2559	$self->_emit ("close");
2364	}	2560	}
2365		2561
2366	$self->emit (changed => $self->{state});	2562	$self->_emit (changed => $self->{state});
2367	}	2563	}
2368		2564
2369	#############################################################################	2565	#############################################################################
2370		2566
2371	package CFClient::UI::Tooltip;	2567	package CFClient::UI::Tooltip;
…		…
2385		2581
2386	sub set_tooltip_from {	2582	sub set_tooltip_from {
2387	my ($self, $widget) = @_;	2583	my ($self, $widget) = @_;
2388		2584
2389	$self->add (new CFClient::UI::Label	2585	$self->add (new CFClient::UI::Label
2390	markup => $widget->{tooltip},	2586	markup => $widget->{tooltip},
2391	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2587	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392	fontsize => 0.8,	2588	fontsize => 0.8,
2393	fg => [0, 0, 0, 1],	2589	fg => [0, 0, 0, 1],
		2590	ellipsise => 0,
2394	font => ($widget->{tooltip_font} || $::FONT_PROP),	2591	font => ($widget->{tooltip_font} || $::FONT_PROP),
2395	);	2592	);
2396	}	2593	}
2397		2594
2398	sub size_request {	2595	sub size_request {
2399	my ($self) = @_;	2596	my ($self) = @_;
…		…
2445	use CFClient::OpenGL;	2642	use CFClient::OpenGL;
2446		2643
2447	sub new {	2644	sub new {
2448	my $class = shift;	2645	my $class = shift;
2449		2646
2450	$class->SUPER::new (	2647	my $self = $class->SUPER::new (
2451	aspect => 1,	2648	aspect => 1,
		2649	can_events => 0,
2452	@_,	2650	@_,
2453	)	2651	);
		2652
		2653	if ($self->{anim} && $self->{animspeed}) {
		2654	Scalar::Util::weaken (my $widget = $self);
		2655
		2656	$self->{timer} = Event->timer (
		2657	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2658	hard => 1,
		2659	interval => $self->{animspeed},
		2660	cb => sub {
		2661	++$widget->{frame};
		2662	$widget->update;
		2663	},
		2664	);
		2665	}
		2666
		2667	$self
2454	}	2668	}
2455		2669
2456	sub size_request {	2670	sub size_request {
2457	(32, 8)	2671	(32, 8)
2458	}	2672	}
2459		2673
		2674	sub update {
		2675	my ($self) = @_;
		2676
		2677	return unless $self->{visible};
		2678
		2679	$self->SUPER::update;
		2680	}
		2681
2460	sub _draw {	2682	sub _draw {
2461	my ($self) = @_;	2683	my ($self) = @_;
2462		2684
2463	return unless $::CONN;#d# manage and cache textures differently	2685	return unless $::CONN;
		2686
		2687	my $face;
		2688
		2689	if ($self->{frame}) {
		2690	my $anim = $::CONN->{anim}[$self->{anim}];
		2691
		2692	$face = $anim->[ $self->{frame} % @$anim ]
		2693	if $anim && @$anim;
		2694	}
		2695
2464	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2696	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465		2697
2466	# TODO animation
2467	if ($tex) {	2698	if ($tex) {
2468	glEnable GL_TEXTURE_2D;	2699	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2701	glColor 1, 1, 1, 1;
2471	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2702	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2703	glDisable GL_TEXTURE_2D;
2473	}	2704	}
2474	}	2705	}
2475		2706
		2707	sub DESTROY {
		2708	my ($self) = @_;
		2709
		2710	$self->{timer}->cancel
		2711	if $self->{timer};
		2712
		2713	$self->SUPER::DESTROY;
		2714	}
		2715
2476	#############################################################################	2716	#############################################################################
2477		2717
2478	package CFClient::UI::InventoryItem;	2718	package CFClient::UI::Inventory;
2479		2719
2480	our @ISA = CFClient::UI::HBox::;	2720	our @ISA = CFClient::UI::ScrolledWindow::;
2481		2721
2482	sub new {	2722	sub new {
2483	my $class = shift;	2723	my $class = shift;
2484		2724
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 (	2725	my $self = $class->SUPER::new (
2495	can_hover => 1,	2726	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	@_,	2727	@_,
2554	);	2728	);
2555		2729
2556	$self	2730	$self
2557	}	2731	}
…		…
2567	or ($a->{name} cmp $b->{name})	2741	or ($a->{name} cmp $b->{name})
2568	} @$items;	2742	} @$items;
2569		2743
2570	$self->{real_items} = \@items;	2744	$self->{real_items} = \@items;
2571		2745
		2746	my $row = 0;
2572	for my $item (@items) {	2747	for my $item (@items) {
2573	my $desc = $item->{nrof} < 2	2748	CFClient::Item::update_widgets $item;
2574	? $item->{name}
2575	: "$item->{nrof} $item->{name_pl}";
2576		2749
2577	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2750	$self->{scrolled}->add (0, $row, $item->{face_widget});
2578	}	2751	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2752	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2579		2753
2580	$self->{scrolled}->add (@items);	2754	$row++;
		2755	}
2581		2756
2582	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2757	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583	}	2758	}
2584		2759
2585	sub size_request {	2760	sub size_request {
…		…
2627		2802
2628	# popup given the event (must be a mouse button down event currently)	2803	# popup given the event (must be a mouse button down event currently)
2629	sub popup {	2804	sub popup {
2630	my ($self, $ev) = @_;	2805	my ($self, $ev) = @_;
2631		2806
2632	$self->emit ("popdown");	2807	$self->_emit ("popdown");
2633		2808
2634	# maybe save $GRAB? must be careful about events...	2809	# maybe save $GRAB? must be careful about events...
2635	$GRAB = $self;	2810	$GRAB = $self;
2636	$self->{button} = $ev->{button};	2811	$self->{button} = $ev->{button};
2637		2812
…		…
2652		2827
2653	if ($ev->{button} == $self->{button}) {	2828	if ($ev->{button} == $self->{button}) {
2654	undef $GRAB;	2829	undef $GRAB;
2655	$self->hide;	2830	$self->hide;
2656		2831
2657	$self->emit ("popdown");	2832	$self->_emit ("popdown");
2658	$self->{hover}[1]->() if $self->{hover};	2833	$self->{hover}[1]->() if $self->{hover};
2659	}	2834	}
2660	}	2835	}
2661		2836
2662	#############################################################################	2837	#############################################################################
2663		2838
2664	package CFClient::UI::Statusbox;	2839	package CFClient::UI::Statusbox;
2665		2840
2666	our @ISA = CFClient::UI::VBox::;	2841	our @ISA = CFClient::UI::VBox::;
		2842
		2843	sub new {
		2844	my $class = shift;
		2845
		2846	$class->SUPER::new (
		2847	fontsize => 0.8,
		2848	@_,
		2849	)
		2850	}
2667		2851
2668	sub reorder {	2852	sub reorder {
2669	my ($self) = @_;	2853	my ($self) = @_;
2670	my $NOW = time;	2854	my $NOW = time;
2671		2855
…		…
2690	? "<b>$item->{count} ×</b> $item->{text}"	2874	? "<b>$item->{count} ×</b> $item->{text}"
2691	: $item->{text};	2875	: $item->{text};
2692		2876
2693	for ($short) {	2877	for ($short) {
2694	s/^\s+//;	2878	s/^\s+//;
2695	s/\012.*/…/s;	2879	s/\s+/ /g;
2696	my $len = int 40 / $item->{fontsize};
2697	substr $_, $len, length, "…" if $len < length;
2698	}	2880	}
2699		2881
2700	new CFClient::UI::Label	2882	new CFClient::UI::Label
2701	markup => $short,	2883	markup => $short,
2702	tooltip => $item->{tooltip},	2884	tooltip => $item->{tooltip},
2703	tooltip_font => $::FONT_PROP,	2885	tooltip_font => $::FONT_PROP,
2704	tooltip_width => 0.67,	2886	tooltip_width => 0.67,
2705	fontsize => $item->{fontsize},	2887	fontsize => $item->{fontsize} || $self->{fontsize},
		2888	max_w => $::WIDTH * 0.44,
2706	color => $item->{color},	2889	fg => $item->{fg},
2707	can_events => 1,	2890	can_events => 1,
2708	can_hover => 1	2891	can_hover => 1
2709	};	2892	};
2710	}	2893	}
2711		2894
…		…
2716	sub add {	2899	sub add {
2717	my ($self, $text, %arg) = @_;	2900	my ($self, $text, %arg) = @_;
2718		2901
2719	$text =~ s/^\s+//;	2902	$text =~ s/^\s+//;
2720	$text =~ s/\s+$//;	2903	$text =~ s/\s+$//;
		2904
		2905	return unless $text;
2721		2906
2722	my $timeout = time + ((delete $arg{timeout}) || 60);	2907	my $timeout = time + ((delete $arg{timeout}) || 60);
2723		2908
2724	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2909	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725		2910
…		…
2737	$self->{item}{$group} = {	2922	$self->{item}{$group} = {
2738	id => ++$self->{id},	2923	id => ++$self->{id},
2739	text => $text,	2924	text => $text,
2740	timeout => $timeout,	2925	timeout => $timeout,
2741	tooltip => $text,	2926	tooltip => $text,
2742	fontsize => 0.8,
2743	color => [0.8, 0.8, 0.8, 0.8],	2927	fg => [0.8, 0.8, 0.8, 0.8],
2744	pri => 0,	2928	pri => 0,
2745	count => 1,	2929	count => 1,
2746	%arg,	2930	%arg,
2747	};	2931	};
2748	}	2932	}
2749		2933
2750	$self->reorder;	2934	$self->reorder;
2751	}	2935	}
2752		2936
		2937	sub reconfigure {
		2938	my ($self) = @_;
		2939
		2940	delete $_->{label}
		2941	for values %{ $self->{item} || {} };
		2942
		2943	$self->reorder;
		2944	$self->SUPER::reconfigure;
		2945	}
		2946
2753	#############################################################################	2947	#############################################################################
2754		2948
2755	package CFClient::UI::Root;	2949	package CFClient::UI::Root;
2756		2950
2757	our @ISA = CFClient::UI::Container::;	2951	our @ISA = CFClient::UI::Container::;
…		…
2787	}	2981	}
2788		2982
2789	sub size_allocate {	2983	sub size_allocate {
2790	my ($self, $w, $h) = @_;	2984	my ($self, $w, $h) = @_;
2791		2985
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) {	2986	for my $child ($self->children) {
2799	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2987	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800		2988
		2989	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2990	if exists $child->{req_x};
		2991
		2992	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2993	if exists $child->{req_y};
		2994
2801	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2995	$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;	2996	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2997
2803	$child->configure ($X, $Y, $W, $H);	2998	$child->configure ($X, $Y, $W, $H);
2804	}	2999	}
2805	}	3000	}
2806		3001
2807	sub coord2local {	3002	sub coord2local {
…		…
2824	}	3019	}
2825		3020
2826	sub add {	3021	sub add {
2827	my ($self, @children) = @_;	3022	my ($self, @children) = @_;
2828		3023
		3024	for (my @widgets = @children; my $w = pop @widgets; ) {
		3025	push @widgets, $w->children;
		3026	$w->{root} = $self;
		3027	$w->{visible} = 1;
		3028	}
		3029
2829	for my $child (@children) {	3030	for my $child (@children) {
2830	$child->{toplevel} = 1;	3031	$child->{is_toplevel} = 1;
2831		3032
2832	# integerise window positions	3033	# integerise window positions
2833	$child->{x} = int $child->{x};	3034	$child->{x} = int $child->{x};
2834	$child->{y} = int $child->{y};	3035	$child->{y} = int $child->{y};
2835	}	3036	}
2836		3037
2837	$self->SUPER::add (@children);	3038	$self->SUPER::add (@children);
		3039	}
		3040
		3041	sub remove {
		3042	my ($self, @children) = @_;
		3043
		3044	$self->SUPER::remove (@children);
		3045
		3046	while (@children) {
		3047	my $w = pop @children;
		3048	push @children, $w->children;
		3049	$w->set_invisible;
		3050	}
2838	}	3051	}
2839		3052
2840	sub on_refresh {	3053	sub on_refresh {
2841	my ($self, $id, $cb) = @_;	3054	my ($self, $id, $cb) = @_;
2842		3055
…		…
2895	$w = 0 if $w < 0;	3108	$w = 0 if $w < 0;
2896	$h = 0 if $h < 0;	3109	$h = 0 if $h < 0;
2897		3110
2898	$widget->{w} = $w;	3111	$widget->{w} = $w;
2899	$widget->{h} = $h;	3112	$widget->{h} = $h;
2900	$widget->size_allocate ($w, $h);
2901	$widget->emit (size_allocate => $w, $h);	3113	$widget->emit (size_allocate => $w, $h);
2902	}	3114	}
2903	}	3115	}
2904		3116
2905	while ($self->{post_alloc_hook}) {	3117	while ($self->{post_alloc_hook}) {
…		…
2911	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3123	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912	glClear GL_COLOR_BUFFER_BIT;	3124	glClear GL_COLOR_BUFFER_BIT;
2913		3125
2914	glMatrixMode GL_PROJECTION;	3126	glMatrixMode GL_PROJECTION;
2915	glLoadIdentity;	3127	glLoadIdentity;
2916	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3128	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917	glMatrixMode GL_MODELVIEW;	3129	glMatrixMode GL_MODELVIEW;
2918	glLoadIdentity;	3130	glLoadIdentity;
2919		3131
2920	$self->_draw;	3132	$self->_draw;
2921	}	3133	}
…		…
2923	#############################################################################	3135	#############################################################################
2924		3136
2925	package CFClient::UI;	3137	package CFClient::UI;
2926		3138
2927	$ROOT = new CFClient::UI::Root;	3139	$ROOT = new CFClient::UI::Root;
2928	$TOOLTIP = new CFClient::UI::Tooltip;	3140	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929		3141
2930	1	3142	1
2931		3143

Diff Legend

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