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.201 by root, Sat May 13 23:17:49 2006 UTC vs.
Revision 1.236 by root, Thu May 25 16:54:29 2006 UTC

…		…
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		12
13	our $ROOT;	13	our $ROOT;
14	our $TOOLTIP;	14	our $TOOLTIP;
15	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
16		18
17	sub check_tooltip {	19	sub check_tooltip {
18	if (!$GRAB) {	20	if (!$GRAB) {
19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
29	$TOOLTIP->set_tooltip_from ($widget);	31	$TOOLTIP->set_tooltip_from ($widget);
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
39	$TOOLTIP->check_size;	40	$TOOLTIP->check_size;
40	$TOOLTIP->update;	41	$TOOLTIP->update;
41	}	42	}
…		…
49	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
50	}	51	}
51		52
52	# class methods for events	53	# class methods for events
53	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
54	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	55	$FOCUS->emit (key_down => $_[0])
55	if $FOCUS;	56	if $FOCUS;
56	}	57	}
57		58
58	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
59	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	60	$FOCUS->emit (key_up => $_[0])
60	if $FOCUS;	61	if $FOCUS;
61	}	62	}
62		63
63	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
64	my ($ev) = @_;	65	my ($ev) = @_;
…		…
73	check_tooltip;	74	check_tooltip;
74	}	75	}
75		76
76	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
77		78
78	if ($GRAB) {	79	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79	($x, $y) = $GRAB->coord2local ($x, $y);	80	if $GRAB;
80	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81	}
82	}	81	}
83		82
84	sub feed_sdl_button_up_event {	83	sub feed_sdl_button_up_event {
85	my ($ev) = @_;	84	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	85	my ($x, $y) = ($ev->{x}, $ev->{y});
87		86
88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89		88
90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91		90
92	if ($GRAB) {	91	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93	($x, $y) = $GRAB->coord2local ($x, $y);	92	if $GRAB;
94	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95	}
96		93
97	if (!$BUTTON_STATE) {	94	if (!$BUTTON_STATE) {
98	my $grab = $GRAB; undef $GRAB;	95	my $grab = $GRAB; undef $GRAB;
99	$grab->update if $grab;	96	$grab->update if $grab;
100	$GRAB->update if $GRAB;	97	$GRAB->update if $GRAB;
…		…
116	$HOVER->update if $HOVER && $HOVER->{can_hover};	113	$HOVER->update if $HOVER && $HOVER->{can_hover};
117		114
118	check_tooltip;	115	check_tooltip;
119	}	116	}
120		117
121	if ($HOVER) {
122	($x, $y) = $HOVER->coord2local ($x, $y);
123	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	118	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124	}	119	if $HOVER;
125	}	120	}
126		121
127	# convert position array to integers	122	# convert position array to integers
128	sub harmonize {	123	sub harmonize {
129	my ($vals) = @_;	124	my ($vals) = @_;
…		…
133	for (@$vals) {	128	for (@$vals) {
134	my $i = int $_ + $rem;	129	my $i = int $_ + $rem;
135	$rem += $_ - $i;	130	$rem += $_ - $i;
136	$_ = $i;	131	$_ = $i;
137	}	132	}
		133	}
		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
		151	# call when resolution changes etc.
		152	sub rescale_widgets {
		153	my ($sx, $sy) = @_;
		154
		155	for my $widget (values %WIDGET) {
		156	if ($widget->{is_toplevel}) {
		157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		158	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		159	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		162	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		163	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		165	}
		166	}
		167
		168	reconfigure_widgets;
138	}	169	}
139		170
140	#############################################################################	171	#############################################################################
141		172
142	package CFClient::UI::Base;	173	package CFClient::UI::Base;
…		…
160	if (/^connect_(.*)$/) {	191	if (/^connect_(.*)$/) {
161	$self->connect ($1 => delete $self->{$_});	192	$self->connect ($1 => delete $self->{$_});
162	}	193	}
163	}	194	}
164		195
		196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		197
165	$self	198	$self
166	}	199	}
167		200
168	sub destroy {	201	sub destroy {
169	my ($self) = @_;	202	my ($self) = @_;
…		…
172	%$self = ();	205	%$self = ();
173	}	206	}
174		207
175	sub show {	208	sub show {
176	my ($self) = @_;	209	my ($self) = @_;
177
178	return if $self->{parent};	210	return if $self->{parent};
179		211
180	$CFClient::UI::ROOT->add ($self);	212	$CFClient::UI::ROOT->add ($self);
181	}	213	}
182		214
183	sub hide {	215	sub show_centered {
184	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};
185		234
186	undef $GRAB if $GRAB == $self;	235	undef $GRAB if $GRAB == $self;
187	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;
188		248
189	$self->{parent}->remove ($self)	249	$self->{parent}->remove ($self)
190	if $self->{parent};	250	if $self->{parent};
191	}	251	}
192		252
…		…
242		302
243	sub size_allocate {	303	sub size_allocate {
244	# nothing to be done	304	# nothing to be done
245	}	305	}
246		306
247	sub children {
248	}
249
250	# call when resolution changes etc.
251	sub reconfigure {	307	sub reconfigure {
252	my ($self) = @_;	308	my ($self) = @_;
253
254	$_->reconfigure
255	for $self->children;
256		309
257	$self->check_size (1);	310	$self->check_size (1);
258	$self->update;	311	$self->update;
259	}	312	}
260		313
		314	sub children {
		315	}
		316
261	sub set_max_size {	317	sub set_max_size {
262	my ($self, $w, $h) = @_;	318	my ($self, $w, $h) = @_;
263		319
264	delete $self->{max_w}; $self->{max_w} = $w if $w;	320	delete $self->{max_w}; $self->{max_w} = $w if $w;
265	delete $self->{max_h}; $self->{max_h} = $h if $h;	321	delete $self->{max_h}; $self->{max_h} = $h if $h;
		322	}
		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	}
266	}	338	}
267		339
268	# translate global coordinates to local coordinate system	340	# translate global coordinates to local coordinate system
269	sub coord2local {	341	sub coord2local {
270	my ($self, $x, $y) = @_;	342	my ($self, $x, $y) = @_;
…		…
285	return if $FOCUS == $self;	357	return if $FOCUS == $self;
286	return unless $self->{can_focus};	358	return unless $self->{can_focus};
287		359
288	my $focus = $FOCUS; $FOCUS = $self;	360	my $focus = $FOCUS; $FOCUS = $self;
289		361
290	$self->emit (focus_in => $focus);	362	$self->_emit (focus_in => $focus);
291		363
292	$focus->update if $focus;	364	$focus->update if $focus;
293	$FOCUS->update;	365	$FOCUS->update;
294	}	366	}
295		367
…		…
298		370
299	return unless $FOCUS == $self;	371	return unless $FOCUS == $self;
300		372
301	my $focus = $FOCUS; undef $FOCUS;	373	my $focus = $FOCUS; undef $FOCUS;
302		374
303	$self->emit (focus_out => $focus);	375	$self->_emit (focus_out => $focus);
304		376
305	$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;
306	}	381	}
307		382
308	sub mouse_motion { }	383	sub mouse_motion { }
309	sub button_up { }	384	sub button_up { }
310	sub key_down { }	385	sub key_down { }
311	sub key_up { }	386	sub key_up { }
312		387
313	sub button_down {	388	sub button_down {
314	my ($self, $ev, $x, $y) = @_;	389	my ($self, $ev, $x, $y) = @_;
315		390
316	$self->focus_in;	391	$self->focus_in;
…		…
350	if ($ENV{PCLIENT_DEBUG}) {	425	if ($ENV{PCLIENT_DEBUG}) {
351	glPushMatrix;	426	glPushMatrix;
352	glColor 1, 1, 0, 1;	427	glColor 1, 1, 0, 1;
353	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354	glBegin GL_LINE_LOOP;	429	glBegin GL_LINE_LOOP;
355	glVertex 0 , 0;	430	glVertex 0 , 0;
356	glVertex $self->{w}, 0;	431	glVertex $self->{w} - 1, 0;
357	glVertex $self->{w}, $self->{h};	432	glVertex $self->{w} - 1, $self->{h} - 1;
358	glVertex 0 , $self->{h};	433	glVertex 0 , $self->{h} - 1;
359	glEnd;	434	glEnd;
360	glPopMatrix;	435	glPopMatrix;
361	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;
362	}	437	}
363	}	438	}
364		439
365	sub _draw {	440	sub _draw {
366	my ($self) = @_;	441	my ($self) = @_;
…		…
386	Scalar::Util::weaken ($self->{parent} = $parent);	461	Scalar::Util::weaken ($self->{parent} = $parent);
387		462
388	# TODO: req_w _does_change after ->reconfigure	463	# TODO: req_w _does_change after ->reconfigure
389	$self->check_size	464	$self->check_size
390	unless exists $self->{req_w};	465	unless exists $self->{req_w};
		466
		467	$self->show;
391	}	468	}
392		469
393	sub check_size {	470	sub check_size {
394	my ($self, $forced) = @_;	471	my ($self, $forced) = @_;
395		472
…		…
408	my ($self, $signal, $cb) = @_;	485	my ($self, $signal, $cb) = @_;
409		486
410	push @{ $self->{signal_cb}{$signal} }, $cb;	487	push @{ $self->{signal_cb}{$signal} }, $cb;
411	}	488	}
412		489
		490	sub _emit {
		491	my ($self, $signal, @args) = @_;
		492
		493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		494	}
		495
413	sub emit {	496	sub emit {
414	my ($self, $signal, @args) = @_;	497	my ($self, $signal, @args) = @_;
415		498
416	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	499	$self->_emit ($signal, @args)
		500	|| $self->$signal (@args);
417	}	501	}
418		502
419	sub DESTROY {	503	sub DESTROY {
420	my ($self) = @_;	504	my ($self) = @_;
421		505
		506	delete $WIDGET{$self+0};
422	#$self->deactivate;	507	#$self->deactivate;
423	}	508	}
424		509
425	#############################################################################	510	#############################################################################
426		511
…		…
435	my $class = shift;	520	my $class = shift;
436		521
437	# range [value, low, high, page]	522	# range [value, low, high, page]
438		523
439	$class->SUPER::new (	524	$class->SUPER::new (
440	bg => [0, 0, 0, 0.2],	525	#bg => [0, 0, 0, 0.2],
441	active_bg => [1, 1, 1, 0.5],	526	#active_bg => [1, 1, 1, 0.5],
442	@_	527	@_
443	)	528	)
444	}	529	}
445		530
446	sub _draw {	531	sub _draw {
447	my ($self) = @_;	532	my ($self) = @_;
448		533
		534	my $color = $FOCUS == $self && $self->{active_bg}
		535	? $self->{active_bg}
		536	: $self->{bg};
		537
		538	if ($color && (@$color < 4 || $color->[3])) {
449	my ($w, $h) = @$self{qw(w h)};	539	my ($w, $h) = @$self{qw(w h)};
450		540
451	glEnable GL_BLEND;	541	glEnable GL_BLEND;
452	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	542	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	543	glColor @$color;
454		544
455	glBegin GL_QUADS;	545	glBegin GL_QUADS;
456	glVertex 0 , 0;	546	glVertex 0 , 0;
457	glVertex 0 , $h;	547	glVertex 0 , $h;
458	glVertex $w, $h;	548	glVertex $w, $h;
459	glVertex $w, 0;	549	glVertex $w, 0;
460	glEnd;	550	glEnd;
461		551
462	glDisable GL_BLEND;	552	glDisable GL_BLEND;
		553	}
463	}	554	}
464		555
465	#############################################################################	556	#############################################################################
466		557
467	package CFClient::UI::Empty;	558	package CFClient::UI::Empty;
…		…
527	delete $child->{parent};	618	delete $child->{parent};
528	$child->hide;	619	$child->hide;
529		620
530	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	621	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531		622
532	$self->check_size;	623	$self->check_size (1);
533	$self->update;	624	$self->update;
534	}	625	}
535		626
536	sub clear {	627	sub clear {
537	my ($self) = @_;	628	my ($self) = @_;
…		…
651	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	742	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652	glClearColor 0, 0, 0, 0;	743	glClearColor 0, 0, 0, 0;
653	glClear GL_COLOR_BUFFER_BIT;	744	glClear GL_COLOR_BUFFER_BIT;
654		745
655	$self->_render;	746	$self->_render;
656	# glColorMask 1, 1, 1, 0;
657	# glEnable GL_BLEND;
658	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659	# glRasterPos 0, 0;
660	# glCopyPixels 0, 0, $self->{w}, $self->{h};
661	# glDisable GL_BLEND;
662	# glColorMask 1, 1, 1, 1;
663	};	747	};
664	}	748	}
665		749
666	sub _draw {	750	sub _draw {
667	my ($self) = @_;	751	my ($self) = @_;
…		…
671	my $tex = $self->{texture}	755	my $tex = $self->{texture}
672	or return;	756	or return;
673		757
674	glEnable GL_TEXTURE_2D;	758	glEnable GL_TEXTURE_2D;
675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	759	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676	glColor 0, 0, 0, 1;	760	glColor 1, 1, 1, 1;
677		761
678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	762	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679		763
680	glDisable GL_TEXTURE_2D;	764	glDisable GL_TEXTURE_2D;
681	}	765	}
…		…
684		768
685	package CFClient::UI::ViewPort;	769	package CFClient::UI::ViewPort;
686		770
687	our @ISA = CFClient::UI::Window::;	771	our @ISA = CFClient::UI::Window::;
688		772
		773	sub new {
		774	my $class = shift;
		775
		776	$class->SUPER::new (
		777	scroll_x => 0,
		778	scroll_y => 1,
		779	@_,
		780	)
		781	}
		782
689	sub size_request {	783	sub size_request {
690	my ($self) = @_;	784	my ($self) = @_;
691		785
692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	786	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
694		787
695	@$self{qw(child_w child_h)}	788	@$self{qw(child_w child_h)}
696	}	789	}
697		790
698	sub size_allocate {	791	sub size_allocate {
699	my ($self, $w, $h) = @_;	792	my ($self, $w, $h) = @_;
700		793
		794	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		795	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		796
		797	$self->child->configure (0, 0, $w, $h);
701	$self->update;	798	$self->update;
702	}	799	}
703		800
704	sub set_offset {	801	sub set_offset {
705	my ($self, $x, $y) = @_;	802	my ($self, $x, $y) = @_;
…		…
759		856
760	my $slider = new CFClient::UI::Slider	857	my $slider = new CFClient::UI::Slider
761	vertical => 1,	858	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	859	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	860	connect_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	861	$self->{vp}->set_offset (0, $_[1]);
765	},	862	},
766	;	863	;
767		864
768	$self = $class->SUPER::new (	865	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	866	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	867	slider => $slider,
771	@_,	868	@_,
772	);	869	);
773		870
774	$self->{vp}->add ($self->{scrolled});	871	$self->{vp}->add ($self->{scrolled});
775	$self->add ($self->{vp});	872	$self->add ($self->{vp});
776	$self->add ($self->{slider});	873	$self->add ($self->{slider});
777		874
778	$self	875	$self
		876	}
		877
		878	sub size_allocate {
		879	my ($self, $w, $h) = @_;
		880
		881	$self->SUPER::size_allocate ($w, $h);
		882
		883	my $child = $self->{vp}->child;
		884	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
779	}	885	}
780		886
781	#TODO# update range on size_allocate depending on child	887	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	888	# update viewport offset on scroll
783		889
…		…
837	my $class = shift;	943	my $class = shift;
838		944
839	# TODO: user_x, user_y, overwrite moveto?	945	# TODO: user_x, user_y, overwrite moveto?
840		946
841	my $self = $class->SUPER::new (	947	my $self = $class->SUPER::new (
842	bg => [1, 1, 1, 1],	948	bg => [1, 1, 1, 1],
843	border_bg => [1, 1, 1, 1],	949	border_bg => [1, 1, 1, 1],
844	border => 0.6,	950	border => 0.6,
		951	is_toplevel => 1,
845	can_events => 1,	952	can_events => 1,
846	@_	953	@_
847	);	954	);
848		955
849	$self->{title} &&= new CFClient::UI::Label	956	$self->{title} &&= new CFClient::UI::Label
850	align => 0,	957	align => 0,
…		…
874	my ($self, $w, $h) = @_;	981	my ($self, $w, $h) = @_;
875		982
876	$h -= List::Util::max 0, $self->border * 2;	983	$h -= List::Util::max 0, $self->border * 2;
877	$w -= List::Util::max 0, $self->border * 2;	984	$w -= List::Util::max 0, $self->border * 2;
878		985
879	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	986	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
880	if $self->{title};	987	if $self->{title};
881		988
882	$self->child->configure ($self->border, $self->border, $w, $h);	989	$self->child->configure ($self->border, $self->border, $w, $h);
883	}	990	}
884		991
…		…
990	sub new {	1097	sub new {
991	my $class = shift;	1098	my $class = shift;
992		1099
993	$class->SUPER::new (	1100	$class->SUPER::new (
994	col_expand => [],	1101	col_expand => [],
995	@_	1102	@_,
996	)	1103	)
		1104	}
		1105
		1106	sub children {
		1107	grep $_, map @$_, grep $_, @{ $_[0]{children} }
997	}	1108	}
998		1109
999	sub add {	1110	sub add {
1000	my ($self, $x, $y, $child) = @_;	1111	my ($self, $x, $y, $child) = @_;
1001		1112
1002	$child->set_parent ($self);	1113	$child->set_parent ($self);
1003	$self->{children}[$y][$x] = $child;	1114	$self->{children}[$y][$x] = $child;
1004		1115
1005	$child->check_size;	1116	$self->check_size (1);
1006	}	1117	}
1007		1118
1008	sub children {
1009	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1010	}
1011
1012	# TODO: move to container class maybe? send childs a signal on removal?	1119	# TODO: move to container class maybe? send children a signal on removal?
1013	sub clear {	1120	sub clear {
1014	my ($self) = @_;	1121	my ($self) = @_;
1015		1122
1016	my @children = $self->children;	1123	my @children = $self->children;
1017	delete $self->{children};	1124	delete $self->{children};
…		…
1019	for (@children) {	1126	for (@children) {
1020	delete $_->{parent};	1127	delete $_->{parent};
1021	$_->hide;	1128	$_->hide;
1022	}	1129	}
1023		1130
		1131	$self->check_size (1);
1024	$self->update;	1132	$self->update;
1025	}	1133	}
1026		1134
1027	sub get_wh {	1135	sub get_wh {
1028	my ($self) = @_;	1136	my ($self) = @_;
…		…
1245		1353
1246	#############################################################################	1354	#############################################################################
1247		1355
1248	package CFClient::UI::Label;	1356	package CFClient::UI::Label;
1249		1357
1250	our @ISA = CFClient::UI::Base::;	1358	our @ISA = CFClient::UI::DrawBG::;
1251		1359
1252	use CFClient::OpenGL;	1360	use CFClient::OpenGL;
1253		1361
1254	sub new {	1362	sub new {
1255	my ($class, %arg) = @_;	1363	my ($class, %arg) = @_;
1256		1364
1257	my $self = $class->SUPER::new (	1365	my $self = $class->SUPER::new (
1258	fg => [1, 1, 1],	1366	fg => [1, 1, 1],
		1367	#bg => none
		1368	#active_bg => none
1259	#font => default_font	1369	#font => default_font
1260	#text => initial text	1370	#text => initial text
1261	#markup => initial narkup	1371	#markup => initial narkup
		1372	#max_w => maximum pixel width
		1373	ellipsise => 3, # end
1262	layout => (new CFClient::Layout),	1374	layout => (new CFClient::Layout),
1263	fontsize => 1,	1375	fontsize => 1,
1264	align => -1,	1376	align => -1,
1265	valign => -1,	1377	valign => -1,
1266	padding => 2,	1378	padding => 2,
…		…
1281	}	1393	}
1282		1394
1283	$self	1395	$self
1284	}	1396	}
1285		1397
1286	sub escape {	1398	sub escape($) {
1287	local $_ = $_[1];	1399	local $_ = $_[0];
1288		1400
1289	s/&/&amp;/g;	1401	s/&/&amp;/g;
1290	s/>/&gt;/g;	1402	s/>/&gt;/g;
1291	s/</&lt;/g;	1403	s/</&lt;/g;
1292		1404
1293	$_[1]	1405	$_
1294	}	1406	}
1295		1407
1296	sub update {	1408	sub update {
1297	my ($self) = @_;	1409	my ($self) = @_;
1298		1410
…		…
1331	sub size_request {	1443	sub size_request {
1332	my ($self) = @_;	1444	my ($self) = @_;
1333		1445
1334	$self->{layout}->set_font ($self->{font}) if $self->{font};	1446	$self->{layout}->set_font ($self->{font}) if $self->{font};
1335	$self->{layout}->set_width ($self->{max_w} || -1);	1447	$self->{layout}->set_width ($self->{max_w} || -1);
		1448	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1449	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1450	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337		1451
1338	my ($w, $h) = $self->{layout}->size;	1452	my ($w, $h) = $self->{layout}->size;
1339		1453
1340	if (exists $self->{template}) {	1454	if (exists $self->{template}) {
…		…
1370	}	1484	}
1371		1485
1372	sub _draw {	1486	sub _draw {
1373	my ($self) = @_;	1487	my ($self) = @_;
1374		1488
		1489	$self->SUPER::_draw; # draw background, if applicable
		1490
1375	my $tex = $self->{texture} ||= do {	1491	my $tex = $self->{texture} ||= do {
1376	$self->{layout}->set_foreground (@{$self->{fg}});	1492	$self->{layout}->set_foreground (@{$self->{fg}});
1377	$self->{layout}->set_font ($self->{font}) if $self->{font};	1493	$self->{layout}->set_font ($self->{font}) if $self->{font};
1378	$self->{layout}->set_width ($self->{w});	1494	$self->{layout}->set_width ($self->{w});
		1495	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1496	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1379	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1497	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380		1498
1381	my $tex = new_from_layout CFClient::Texture $self->{layout};	1499	my $tex = new_from_layout CFClient::Texture $self->{layout};
1382		1500
1383	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1501	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1384	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1502	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385	: ($self->{w} - $tex->{w}) * 0.5;	1503	: ($self->{w} - $tex->{w}) * 0.5);
1386		1504
1387	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1505	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1388	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1506	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389	: ($self->{h} - $tex->{h}) * 0.5;	1507	: ($self->{h} - $tex->{h}) * 0.5);
1390		1508
1391	$tex	1509	$tex
1392	};	1510	};
1393		1511
1394	glEnable GL_TEXTURE_2D;	1512	glEnable GL_TEXTURE_2D;
…		…
1422	active_fg => [0, 0, 0],	1540	active_fg => [0, 0, 0],
1423	can_hover => 1,	1541	can_hover => 1,
1424	can_focus => 1,	1542	can_focus => 1,
1425	valign => 0,	1543	valign => 0,
1426	can_events => 1,	1544	can_events => 1,
		1545	#text => ...
1427	@_	1546	@_
1428	)	1547	)
1429	}	1548	}
1430		1549
1431	sub _set_text {	1550	sub _set_text {
…		…
1441	$self->{text} = $text;	1560	$self->{text} = $text;
1442		1561
1443	$text =~ s/./*/g if $self->{hidden};	1562	$text =~ s/./*/g if $self->{hidden};
1444	$self->{layout}->set_text ("$text ");	1563	$self->{layout}->set_text ("$text ");
1445		1564
1446	$self->emit (changed => $self->{text});	1565	$self->_emit (changed => $self->{text});
1447	}	1566	}
1448		1567
1449	sub set_text {	1568	sub set_text {
1450	my ($self, $text) = @_;	1569	my ($self, $text) = @_;
1451		1570
1452	$self->{cursor} = length $text;	1571	$self->{cursor} = length $text;
1453	$self->_set_text ($text);	1572	$self->_set_text ($text);
		1573	$self->update;
1454	$self->check_size;	1574	$self->check_size;
1455	$self->update;
1456	}	1575	}
1457		1576
1458	sub get_text {	1577	sub get_text {
1459	$_[0]{text}	1578	$_[0]{text}
1460	}	1579	}
…		…
1463	my ($self) = @_;	1582	my ($self) = @_;
1464		1583
1465	my ($w, $h) = $self->SUPER::size_request;	1584	my ($w, $h) = $self->SUPER::size_request;
1466		1585
1467	($w + 1, $h) # add 1 for cursor	1586	($w + 1, $h) # add 1 for cursor
1468	}
1469
1470	sub size_allocate {
1471	my ($self, $w, $h) = @_;
1472
1473	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1474	}	1587	}
1475		1588
1476	sub key_down {	1589	sub key_down {
1477	my ($self, $ev) = @_;	1590	my ($self, $ev) = @_;
1478		1591
…		…
1493	} elsif ($sym == CFClient::SDLK_HOME) {	1606	} elsif ($sym == CFClient::SDLK_HOME) {
1494	$self->{cursor} = 0;	1607	$self->{cursor} = 0;
1495	} elsif ($sym == CFClient::SDLK_END) {	1608	} elsif ($sym == CFClient::SDLK_END) {
1496	$self->{cursor} = length $text;	1609	$self->{cursor} = length $text;
1497	} elsif ($uni == 27) {	1610	} elsif ($uni == 27) {
1498	$self->emit ('escape');	1611	$self->_emit ('escape');
1499	} elsif ($uni) {	1612	} elsif ($uni) {
1500	substr $text, $self->{cursor}++, 0, chr $uni;	1613	substr $text, $self->{cursor}++, 0, chr $uni;
1501	}	1614	}
1502		1615
1503	$self->_set_text ($text);	1616	$self->_set_text ($text);
1504	$self->update;	1617	$self->update;
		1618	$self->check_size;
1505	}	1619	}
1506		1620
1507	sub focus_in {	1621	sub focus_in {
1508	my ($self) = @_;	1622	my ($self) = @_;
1509		1623
…		…
1589	if ($sym == 13) {	1703	if ($sym == 13) {
1590	unshift @{$self->{history}},	1704	unshift @{$self->{history}},
1591	my $txt = $self->get_text;	1705	my $txt = $self->get_text;
1592	$self->{history_pointer} = -1;	1706	$self->{history_pointer} = -1;
1593	$self->{history_saveback} = '';	1707	$self->{history_saveback} = '';
1594	$self->emit (activate => $txt);	1708	$self->_emit (activate => $txt);
1595	$self->update;	1709	$self->update;
1596		1710
1597	} elsif ($sym == CFClient::SDLK_UP) {	1711	} elsif ($sym == CFClient::SDLK_UP) {
1598	if ($self->{history_pointer} < 0) {	1712	if ($self->{history_pointer} < 0) {
1599	$self->{history_saveback} = $self->get_text;	1713	$self->{history_saveback} = $self->get_text;
…		…
1638	my $class = shift;	1752	my $class = shift;
1639		1753
1640	$class->SUPER::new (	1754	$class->SUPER::new (
1641	padding => 4,	1755	padding => 4,
1642	fg => [1, 1, 1],	1756	fg => [1, 1, 1],
1643	bg => [1, 1, 1, 0.2],
1644	active_fg => [0, 0, 1],	1757	active_fg => [0, 0, 1],
1645	can_hover => 1,	1758	can_hover => 1,
1646	align => 0,	1759	align => 0,
1647	valign => 0,	1760	valign => 0,
1648	can_events => 1,	1761	can_events => 1,
1649	@_	1762	@_
1650	)	1763	)
1651	}	1764	}
1652		1765
		1766	sub activate { }
		1767
1653	sub button_up {	1768	sub button_up {
1654	my ($self, $ev, $x, $y) = @_;	1769	my ($self, $ev, $x, $y) = @_;
1655		1770
		1771	$self->emit ("activate")
1656	if ($x >= 0 && $x < $self->{w}	1772	if $x >= 0 && $x < $self->{w}
1657	&& $y >= 0 && $y < $self->{h}) {	1773	&& $y >= 0 && $y < $self->{h};
1658	$self->emit ("activate");
1659	}
1660	}	1774	}
1661		1775
1662	sub _draw {	1776	sub _draw {
1663	my ($self) = @_;	1777	my ($self) = @_;
1664		1778
…		…
1696		1810
1697	$class->SUPER::new (	1811	$class->SUPER::new (
1698	padding => 2,	1812	padding => 2,
1699	fg => [1, 1, 1],	1813	fg => [1, 1, 1],
1700	active_fg => [1, 1, 0],	1814	active_fg => [1, 1, 0],
		1815	bg => [0, 0, 0, 0.2],
		1816	active_bg => [1, 1, 1, 0.5],
1701	state => 0,	1817	state => 0,
1702	can_hover => 1,	1818	can_hover => 1,
1703	@_	1819	@_
1704	)	1820	)
1705	}	1821	}
…		…
1714	my ($self, $ev, $x, $y) = @_;	1830	my ($self, $ev, $x, $y) = @_;
1715		1831
1716	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1832	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1717	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1833	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1718	$self->{state} = !$self->{state};	1834	$self->{state} = !$self->{state};
1719	$self->emit (changed => $self->{state});	1835	$self->_emit (changed => $self->{state});
1720	}	1836	}
1721	}	1837	}
1722		1838
1723	sub _draw {	1839	sub _draw {
1724	my ($self) = @_;	1840	my ($self) = @_;
…		…
1989	qw(s1_slider.png s1_slider_bg.png);	2105	qw(s1_slider.png s1_slider_bg.png);
1990		2106
1991	sub new {	2107	sub new {
1992	my $class = shift;	2108	my $class = shift;
1993		2109
1994	# range [value, low, high, page]	2110	# range [value, low, high, page, unit]
1995		2111
1996	# TODO: 0-width page	2112	# TODO: 0-width page
1997	# TODO: req_w/h are wrong with vertical	2113	# TODO: req_w/h are wrong with vertical
1998	# TODO: calculations are off	2114	# TODO: calculations are off
1999	my $self = $class->SUPER::new (	2115	my $self = $class->SUPER::new (
2000	fg => [1, 1, 1],	2116	fg => [1, 1, 1],
2001	active_fg => [0, 0, 0],	2117	active_fg => [0, 0, 0],
		2118	bg => [0, 0, 0, 0.2],
		2119	active_bg => [1, 1, 1, 0.5],
2002	range => [0, 0, 100, 10],	2120	range => [0, 0, 100, 10, 0],
2003	req_w => $::WIDTH / 80,	2121	req_w => $::WIDTH / 80,
2004	req_h => $::WIDTH / 80,	2122	req_h => $::WIDTH / 80,
2005	vertical => 0,	2123	vertical => 0,
2006	can_hover => 1,	2124	can_hover => 1,
2007	inner_pad => 5,	2125	inner_pad => 0.02,
2008	@_	2126	@_
2009	);	2127	);
2010		2128
		2129	$self->set_value ($self->{range}[0]);
		2130	$self->update;
		2131
2011	$self	2132	$self
		2133	}
		2134
		2135	sub set_range {
		2136	my ($self, $range) = @_;
		2137
		2138	$self->{range} = $range;
		2139
		2140	$self->update;
		2141	}
		2142
		2143	sub set_value {
		2144	my ($self, $value) = @_;
		2145
		2146	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2147
		2148	$hi = $lo + 1 if $hi <= $lo;
		2149
		2150	$page = $hi - $lo if $page > $hi - $lo;
		2151
		2152	$value = $lo if $value < $lo;
		2153	$value = $hi - $page if $value > $hi - $page;
		2154
		2155	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2156	if $unit;
		2157
		2158	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2159
		2160	if ($value != $old_value) {
		2161	$self->_emit (changed => $value);
		2162	$self->update;
		2163	}
2012	}	2164	}
2013		2165
2014	sub size_request {	2166	sub size_request {
2015	my ($self) = @_;	2167	my ($self) = @_;
2016		2168
…		…
2022		2174
2023	sub button_down {	2175	sub button_down {
2024	my ($self, $ev, $x, $y) = @_;	2176	my ($self, $ev, $x, $y) = @_;
2025		2177
2026	$self->SUPER::button_down ($ev, $x, $y);	2178	$self->SUPER::button_down ($ev, $x, $y);
		2179
		2180	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2181
2027	$self->mouse_motion ($ev, $x, $y);	2182	$self->mouse_motion ($ev, $x, $y);
2028	}	2183	}
2029		2184
2030	sub mouse_motion {	2185	sub mouse_motion {
2031	my ($self, $ev, $x, $y) = @_;	2186	my ($self, $ev, $x, $y) = @_;
2032		2187
2033	if ($GRAB == $self) {	2188	if ($GRAB == $self) {
		2189	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2190
		2191	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2192
		2193	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2194
		2195	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2196	}
		2197	}
		2198
		2199	sub update {
		2200	my ($self) = @_;
		2201
		2202	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2203	$self->set_value ($self->{range}[0]);
		2204
2034	my ($value, $lo, $hi, $page) = @{$self->{range}};	2205	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2206	my $range = ($hi - $page - $lo) || 1e-100;
2035		2207
2036	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2208	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2037		2209
2038	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2210	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2039	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2211	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2040		2212
2041	$x -= $inner_pad_px; # substract the padding	2213	$value = ($value - $lo) / $range;
2042	$x = $x * ($hi - $lo) / $inner_w + $lo;	2214	$value = $value * $self->{scale} + $self->{offset};
2043	$x = $lo if $x < $lo;
2044	$x = $hi - $page if $x > $hi - $page;
2045	$self->{range}[0] = $x;
2046		2215
2047	$self->emit (changed => $x);	2216	$self->{knob_x} = $value - $knob_w * 0.5;
2048	$self->update;	2217	$self->{knob_w} = $knob_w;
2049	}	2218	});
2050	}
2051		2219
2052	# the inner_* stuff is for generating a padding for the slider handle,	2220	$self->SUPER::update;
2053	# so that the handle doesn't leave the texture. This calculation isn't 100%
2054	# correct propably, but it does the job for now
2055	sub _calc_inner_pad_px {
2056	my ($self, $w) = @_;
2057	($w / 100) * $self->{inner_pad} # % to pixels
2058	}	2221	}
2059		2222
2060	sub _draw {	2223	sub _draw {
2061	my ($self) = @_;	2224	my ($self) = @_;
2062		2225
2063	$self->SUPER::_draw ();	2226	$self->SUPER::_draw ();
2064		2227
2065	my ($w, $h) = @$self{qw(w h)};	2228	glScale $self->{w}, $self->{h};
2066		2229
2067	if ($self->{vertical}) {	2230	if ($self->{vertical}) {
2068	# draw a vertical slider like a rotated horizontal slider	2231	# draw a vertical slider like a rotated horizontal slider
2069		2232
		2233	glTranslate 1, 0, 0;
2070	glRotate 90, 0, 0, 1;	2234	glRotate 90, 0, 0, 1;
2071	glTranslate 0, -$self->{w}, 0;
2072
2073	($w, $h) = ($h, $w);
2074	}	2235	}
2075		2236
2076	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2237	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2238	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078		2239
2079	my ($value, $lo, $hi, $page) = @{$self->{range}};
2080
2081	$hi = $value + 1 if $lo == $hi;
2082
2083	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2084	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2085
2086	$page = int $page * $inner_w / ($hi - $lo);
2087	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2088
2089	$w -= $page;
2090	$page &= ~1;
2091	glTranslate $page * 0.5, 0, 0;
2092	$page ||= 2;
2093
2094	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2095	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2096
2097	glEnable GL_TEXTURE_2D;	2240	glEnable GL_TEXTURE_2D;
2098	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2241	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099		2242
2100	# draw background	2243	# draw background
2101	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2244	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102		2245
2103	# draw handle	2246	# draw handle
2104	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2247	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2105		2248
2106	glDisable GL_TEXTURE_2D;	2249	glDisable GL_TEXTURE_2D;
2107	}	2250	}
		2251
		2252	#############################################################################
		2253
		2254	package CFClient::UI::ValSlider;
		2255
		2256	our @ISA = CFClient::UI::HBox::;
		2257
		2258	sub new {
		2259	my ($class, %arg) = @_;
		2260
		2261	my $range = delete $arg{range};
		2262
		2263	my $self = $class->SUPER::new (
		2264	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2265	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2266	to_value => sub { shift },
		2267	from_value => sub { shift },
		2268	%arg,
		2269	);
		2270
		2271	$self->{slider}->connect (changed => sub {
		2272	my ($self, $value) = @_;
		2273	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2274	$self->{parent}->emit (changed => $value);
		2275	});
		2276
		2277	# $self->{entry}->connect (changed => sub {
		2278	# my ($self, $value) = @_;
		2279	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2280	# $self->{parent}->emit (changed => $value);
		2281	# });
		2282
		2283	$self->add ($self->{slider}, $self->{entry});
		2284
		2285	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2286
		2287	$self
		2288	}
		2289
		2290	sub set_range { shift->{slider}->set_range (@_) }
		2291	sub set_value { shift->{slider}->set_value (@_) }
2108		2292
2109	#############################################################################	2293	#############################################################################
2110		2294
2111	package CFClient::UI::TextView;	2295	package CFClient::UI::TextView;
2112		2296
…		…
2142		2326
2143	$self->{fontsize} = $fontsize;	2327	$self->{fontsize} = $fontsize;
2144	$self->reflow;	2328	$self->reflow;
2145	}	2329	}
2146		2330
2147	sub text_height {
2148	my ($self, $text) = @_;
2149
2150	my $layout = $self->{layout};
2151
2152	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2153	$layout->set_width ($self->{children}[0]{w});
2154	$layout->set_markup ($text);
2155
2156	($layout->size)[1]
2157	}
2158
2159	sub reflow {
2160	my ($self) = @_;
2161
2162	$self->{need_reflow}++;
2163	$self->update;
2164	}
2165
2166	sub size_allocate {	2331	sub size_allocate {
2167	my ($self, $w, $h) = @_;	2332	my ($self, $w, $h) = @_;
2168		2333
2169	$self->SUPER::size_allocate ($w, $h);	2334	$self->SUPER::size_allocate ($w, $h);
2170		2335
…		…
2173	$self->{layout}->set_width ($self->{children}[0]{w});	2338	$self->{layout}->set_width ($self->{children}[0]{w});
2174		2339
2175	$self->reflow;	2340	$self->reflow;
2176	}	2341	}
2177		2342
		2343	sub text_size {
		2344	my ($self, $text, $indent) = @_;
		2345
		2346	my $layout = $self->{layout};
		2347
		2348	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2349	$layout->set_width ($self->{children}[0]{w} - $indent);
		2350	$layout->set_markup ($text);
		2351
		2352	$layout->size
		2353	}
		2354
		2355	sub reflow {
		2356	my ($self) = @_;
		2357
		2358	$self->{need_reflow}++;
		2359	$self->update;
		2360	}
		2361
		2362	sub set_offset {
		2363	my ($self, $offset) = @_;
		2364
		2365	# todo: base offset on lines or so, not on pixels
		2366	$self->{children}[1]->set_value ($offset);
		2367	}
		2368
		2369	sub clear {
		2370	my ($self) = @_;
		2371
		2372	$self->{par} = [];
		2373	$self->{height} = 0;
		2374	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2375	}
		2376
2178	sub add_paragraph {	2377	sub add_paragraph {
2179	my ($self, $color, $text) = @_;	2378	my ($self, $color, $text, $indent) = @_;
2180		2379
2181	#TODO: intelligently "reformat" paragraph	2380	for my $line (split /\n/, $text) {
2182		2381	my ($w, $h) = $self->text_size ($line);
2183	my $height = $self->text_height ($text);
2184
2185	$self->{height} += $height;	2382	$self->{height} += $h;
		2383	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2384	}
2186		2385
2187	push @{$self->{par}}, [$height, $color, $text];
2188
2189	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2386	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2190	$self->{children}[1]->update;
2191	}	2387	}
2192		2388
2193	sub update {	2389	sub update {
2194	my ($self) = @_;	2390	my ($self) = @_;
2195		2391
…		…
2198	return unless $self->{h} > 0;	2394	return unless $self->{h} > 0;
2199		2395
2200	delete $self->{texture};	2396	delete $self->{texture};
2201		2397
2202	$ROOT->on_post_alloc ($self, sub {	2398	$ROOT->on_post_alloc ($self, sub {
		2399	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2400
2203	if (delete $self->{need_reflow}) {	2401	if (delete $self->{need_reflow}) {
2204	my $height = 0;	2402	my $height = 0;
2205		2403
2206	$height += $_->[0] = $self->text_height ($_->[2])	2404	my $layout = $self->{layout};
		2405
		2406	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2407
2207	for @{$self->{par}};	2408	for (@{$self->{par}}) {
		2409	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2410	$layout->set_width ($W - $_->[3]);
		2411	$layout->set_markup ($_->[4]);
		2412	my ($w, $h) = $layout->size;
		2413	$_->[0] = $w + $_->[3];
		2414	$_->[1] = $h;
		2415	}
		2416
		2417	$height += $_->[1];
		2418	}
2208		2419
2209	$self->{height} = $height;	2420	$self->{height} = $height;
2210		2421
2211	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2422	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2212		2423
2213	delete $self->{texture};	2424	delete $self->{texture};
2214	}	2425	}
2215		2426
2216	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2427	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2217	glClearColor 0, 0, 0, 0;	2428	glClearColor 0.5, 0.5, 0.5, 0;
2218	glClear GL_COLOR_BUFFER_BIT;	2429	glClear GL_COLOR_BUFFER_BIT;
2219		2430
2220	glEnable GL_TEXTURE_2D;
2221	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222
2223	my $top = int $self->{children}[1]{range}[0];	2431	my $top = int $self->{children}[1]{range}[0];
2224		2432
2225	my $y0 = $top;	2433	my $y0 = $top;
2226	my $y1 = $top + $self->{h};	2434	my $y1 = $top + $H;
2227		2435
2228	my $y = 0;	2436	my $y = 0;
2229		2437
2230	my $layout = $self->{layout};	2438	my $layout = $self->{layout};
2231		2439
2232	$layout->set_font ($self->{font}) if $self->{font};	2440	$layout->set_font ($self->{font}) if $self->{font};
2233		2441
		2442	glEnable GL_BLEND;
		2443	#TODO# not correct in windows where rgba is forced off
		2444	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2445
2234	for my $par (@{$self->{par}}) {	2446	for my $par (@{$self->{par}}) {
2235	my $h = $par->[0];	2447	my $h = $par->[1];
2236		2448
2237	if ($y0 < $y + $h && $y < $y1) {	2449	if ($y0 < $y + $h && $y < $y1) {
2238	$layout->set_foreground (@{ $par->[1] });	2450	$layout->set_foreground (@{ $par->[2] });
		2451	$layout->set_width ($W - $par->[3]);
2239	$layout->set_markup ($par->[2]);	2452	$layout->set_markup ($par->[4]);
2240		2453
2241	my ($W, $H) = $layout->size;	2454	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2242	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2455
		2456	glRasterPos $par->[3], $y - $y0;
		2457	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2243	}	2458	}
2244		2459
2245	$y += $h;	2460	$y += $h;
2246	}	2461	}
2247		2462
2248	glDisable GL_TEXTURE_2D;	2463	glDisable GL_BLEND;
2249	};	2464	};
2250	});	2465	});
2251	}	2466	}
2252		2467
2253	sub _draw {	2468	sub _draw {
2254	my ($self) = @_;	2469	my ($self) = @_;
2255		2470
2256	glEnable GL_TEXTURE_2D;	2471	glEnable GL_TEXTURE_2D;
2257	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2472	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258	glColor 1, 1, 1, 1;	2473	glColor 1, 1, 1, 1;
2259	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2474	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2260	glDisable GL_TEXTURE_2D;	2475	glDisable GL_TEXTURE_2D;
2261		2476
2262	$self->{children}[1]->draw;	2477	$self->{children}[1]->draw;
2263		2478
2264	}	2479	}
…		…
2333		2548
2334	# TODO: use animation	2549	# TODO: use animation
2335	if ($self->{state} = !$self->{state}) {	2550	if ($self->{state} = !$self->{state}) {
2336	$CFClient::UI::ROOT->add ($self->{other});	2551	$CFClient::UI::ROOT->add ($self->{other});
2337	$self->{other}->move ($self->coord2global (0, $self->{h}));	2552	$self->{other}->move ($self->coord2global (0, $self->{h}));
2338	$self->emit ("open");	2553	$self->_emit ("open");
2339	} else {	2554	} else {
2340	$CFClient::UI::ROOT->remove ($self->{other});	2555	$CFClient::UI::ROOT->remove ($self->{other});
2341	$self->emit ("close");	2556	$self->_emit ("close");
2342	}	2557	}
2343		2558
2344	$self->emit (changed => $self->{state});	2559	$self->_emit (changed => $self->{state});
2345	}	2560	}
2346		2561
2347	#############################################################################	2562	#############################################################################
2348		2563
2349	package CFClient::UI::Tooltip;	2564	package CFClient::UI::Tooltip;
…		…
2363		2578
2364	sub set_tooltip_from {	2579	sub set_tooltip_from {
2365	my ($self, $widget) = @_;	2580	my ($self, $widget) = @_;
2366		2581
2367	$self->add (new CFClient::UI::Label	2582	$self->add (new CFClient::UI::Label
2368	markup => $widget->{tooltip},	2583	markup => $widget->{tooltip},
2369	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2584	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370	fontsize => 0.8,	2585	fontsize => 0.8,
2371	fg => [0, 0, 0, 1],	2586	fg => [0, 0, 0, 1],
		2587	ellipsise => 0,
2372	font => ($widget->{tooltip_font} || $::FONT_PROP),	2588	font => ($widget->{tooltip_font} || $::FONT_PROP),
2373	);	2589	);
2374	}	2590	}
2375		2591
2376	sub size_request {	2592	sub size_request {
2377	my ($self) = @_;	2593	my ($self) = @_;
…		…
2423	use CFClient::OpenGL;	2639	use CFClient::OpenGL;
2424		2640
2425	sub new {	2641	sub new {
2426	my $class = shift;	2642	my $class = shift;
2427		2643
2428	$class->SUPER::new (	2644	my $self = $class->SUPER::new (
2429	aspect => 1,	2645	aspect => 1,
		2646	can_events => 0,
2430	@_,	2647	@_,
2431	)	2648	);
		2649
		2650	if ($self->{anim} && $self->{animspeed}) {
		2651	Scalar::Util::weaken (my $widget = $self);
		2652
		2653	$self->{timer} = Event->timer (
		2654	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2655	hard => 1,
		2656	interval => $self->{animspeed},
		2657	cb => sub {
		2658	++$widget->{frame};
		2659	$widget->update;
		2660	},
		2661	);
		2662	}
		2663
		2664	$self
2432	}	2665	}
2433		2666
2434	sub size_request {	2667	sub size_request {
2435	(32, 8)	2668	(32, 8)
2436	}	2669	}
2437		2670
		2671	sub update {
		2672	my ($self) = @_;
		2673
		2674	return unless $self->{visible};
		2675
		2676	$self->SUPER::update;
		2677	}
		2678
2438	sub _draw {	2679	sub _draw {
2439	my ($self) = @_;	2680	my ($self) = @_;
2440		2681
2441	return unless $::CONN;#d# manage and cache textures differently	2682	return unless $::CONN;
		2683
		2684	my $face;
		2685
		2686	if ($self->{frame}) {
		2687	my $anim = $::CONN->{anim}[$self->{anim}];
		2688
		2689	$face = $anim->[ $self->{frame} % @$anim ]
		2690	if $anim && @$anim;
		2691	}
		2692
2442	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2693	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2443		2694
2444	# TODO animation
2445	if ($tex) {	2695	if ($tex) {
2446	glEnable GL_TEXTURE_2D;	2696	glEnable GL_TEXTURE_2D;
2447	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2697	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448	glColor 1, 1, 1, 1;	2698	glColor 1, 1, 1, 1;
2449	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2699	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450	glDisable GL_TEXTURE_2D;	2700	glDisable GL_TEXTURE_2D;
2451	}	2701	}
2452	}	2702	}
2453		2703
		2704	sub DESTROY {
		2705	my ($self) = @_;
		2706
		2707	$self->{timer}->cancel
		2708	if $self->{timer};
		2709
		2710	$self->SUPER::DESTROY;
		2711	}
		2712
2454	#############################################################################	2713	#############################################################################
2455		2714
2456	package CFClient::UI::InventoryItem;	2715	package CFClient::UI::Inventory;
2457		2716
2458	our @ISA = CFClient::UI::HBox::;	2717	our @ISA = CFClient::UI::ScrolledWindow::;
2459		2718
2460	sub new {	2719	sub new {
2461	my $class = shift;	2720	my $class = shift;
2462		2721
2463	my %args = @_;
2464
2465	my $item = delete $args{item};
2466
2467	my $desc = $item->{nrof} < 2
2468	? $item->{name}
2469	: "$item->{nrof} $item->{name_pl}";
2470
2471
2472	my $self = $class->SUPER::new (	2722	my $self = $class->SUPER::new (
2473	can_hover => 1,	2723	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2474	can_events => 1,
2475	tooltip => (CFClient::UI::Label->escape ($desc)
2476	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477	connect_button_down => sub {
2478	my ($self, $ev, $x, $y) = @_;
2479
2480	# todo: maybe put examine on 1? but should just be a tooltip :(
2481	if ($ev->{button} == 1) {
2482	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483	} elsif ($ev->{button} == 2) {
2484	$::CONN->send ("apply $item->{tag}");
2485	} elsif ($ev->{button} == 3) {
2486	CFClient::UI::Menu->new (
2487	items => [
2488	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489	[
2490	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491	sub { $::CONN->send ("lock $item->{tag}") },
2492	],
2493	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496	],
2497	)->popup ($ev);
2498	}
2499
2500	1
2501	},
2502	%args
2503	);
2504
2505	$self->add (new CFClient::UI::Face
2506	can_events => 0,
2507	face => $item->{face},
2508	anim => $item->{anim},
2509	animspeed => $item->{animspeed},
2510	);
2511
2512	$self->add (new CFClient::UI::Label
2513	can_events => 0,
2514	text => $desc,
2515	);
2516
2517	$self
2518	}
2519
2520	#############################################################################
2521
2522	package CFClient::UI::Inventory;
2523
2524	our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526	sub new {
2527	my $class = shift;
2528
2529	my $self = $class->SUPER::new (
2530	scrolled => (new CFClient::UI::VBox),
2531	@_,	2724	@_,
2532	);	2725	);
2533		2726
2534	$self	2727	$self
2535	}	2728	}
…		…
2545	or ($a->{name} cmp $b->{name})	2738	or ($a->{name} cmp $b->{name})
2546	} @$items;	2739	} @$items;
2547		2740
2548	$self->{real_items} = \@items;	2741	$self->{real_items} = \@items;
2549		2742
		2743	my $row = 0;
2550	for my $item (@items) {	2744	for my $item (@items) {
2551	my $desc = $item->{nrof} < 2	2745	CFClient::Item::update_widgets $item;
2552	? $item->{name}
2553	: "$item->{nrof} $item->{name_pl}";
2554		2746
2555	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2747	$self->{scrolled}->add (0, $row, $item->{face_widget});
2556	}	2748	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2749	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2557		2750
2558	$self->{scrolled}->add (@items);	2751	$row++;
		2752	}
2559		2753
2560	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2754	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2561	}	2755	}
2562		2756
2563	sub size_request {	2757	sub size_request {
…		…
2605		2799
2606	# popup given the event (must be a mouse button down event currently)	2800	# popup given the event (must be a mouse button down event currently)
2607	sub popup {	2801	sub popup {
2608	my ($self, $ev) = @_;	2802	my ($self, $ev) = @_;
2609		2803
2610	$self->emit ("popdown");	2804	$self->_emit ("popdown");
2611		2805
2612	# maybe save $GRAB? must be careful about events...	2806	# maybe save $GRAB? must be careful about events...
2613	$GRAB = $self;	2807	$GRAB = $self;
2614	$self->{button} = $ev->{button};	2808	$self->{button} = $ev->{button};
2615		2809
…		…
2630		2824
2631	if ($ev->{button} == $self->{button}) {	2825	if ($ev->{button} == $self->{button}) {
2632	undef $GRAB;	2826	undef $GRAB;
2633	$self->hide;	2827	$self->hide;
2634		2828
2635	$self->emit ("popdown");	2829	$self->_emit ("popdown");
2636	$self->{hover}[1]->() if $self->{hover};	2830	$self->{hover}[1]->() if $self->{hover};
2637	}	2831	}
2638	}	2832	}
2639		2833
2640	#############################################################################	2834	#############################################################################
2641		2835
2642	package CFClient::UI::Statusbox;	2836	package CFClient::UI::Statusbox;
2643		2837
2644	our @ISA = CFClient::UI::VBox::;	2838	our @ISA = CFClient::UI::VBox::;
		2839
		2840	sub new {
		2841	my $class = shift;
		2842
		2843	$class->SUPER::new (
		2844	fontsize => 0.8,
		2845	@_,
		2846	)
		2847	}
2645		2848
2646	sub reorder {	2849	sub reorder {
2647	my ($self) = @_;	2850	my ($self) = @_;
2648	my $NOW = time;	2851	my $NOW = time;
2649		2852
…		…
2668	? "<b>$item->{count} ×</b> $item->{text}"	2871	? "<b>$item->{count} ×</b> $item->{text}"
2669	: $item->{text};	2872	: $item->{text};
2670		2873
2671	for ($short) {	2874	for ($short) {
2672	s/^\s+//;	2875	s/^\s+//;
2673	s/\012.*/…/s;	2876	s/\s+/ /g;
2674	my $len = int 40 / $item->{fontsize};
2675	substr $_, $len, length, "…" if $len < length;
2676	}	2877	}
2677		2878
2678	new CFClient::UI::Label	2879	new CFClient::UI::Label
2679	markup => $short,	2880	markup => $short,
2680	tooltip => $item->{tooltip},	2881	tooltip => $item->{tooltip},
2681	tooltip_font => $::FONT_PROP,	2882	tooltip_font => $::FONT_PROP,
2682	tooltip_width => 0.67,	2883	tooltip_width => 0.67,
2683	fontsize => $item->{fontsize},	2884	fontsize => $item->{fontsize} || $self->{fontsize},
		2885	max_w => $::WIDTH * 0.44,
2684	color => $item->{color},	2886	fg => $item->{fg},
2685	can_events => 1,	2887	can_events => 1,
2686	can_hover => 1	2888	can_hover => 1
2687	};	2889	};
2688	}	2890	}
2689		2891
…		…
2694	sub add {	2896	sub add {
2695	my ($self, $text, %arg) = @_;	2897	my ($self, $text, %arg) = @_;
2696		2898
2697	$text =~ s/^\s+//;	2899	$text =~ s/^\s+//;
2698	$text =~ s/\s+$//;	2900	$text =~ s/\s+$//;
		2901
		2902	return unless $text;
2699		2903
2700	my $timeout = time + ((delete $arg{timeout}) || 60);	2904	my $timeout = time + ((delete $arg{timeout}) || 60);
2701		2905
2702	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2906	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2703		2907
…		…
2715	$self->{item}{$group} = {	2919	$self->{item}{$group} = {
2716	id => ++$self->{id},	2920	id => ++$self->{id},
2717	text => $text,	2921	text => $text,
2718	timeout => $timeout,	2922	timeout => $timeout,
2719	tooltip => $text,	2923	tooltip => $text,
2720	fontsize => 0.8,
2721	color => [0.8, 0.8, 0.8, 0.8],	2924	fg => [0.8, 0.8, 0.8, 0.8],
2722	pri => 0,	2925	pri => 0,
2723	count => 1,	2926	count => 1,
2724	%arg,	2927	%arg,
2725	};	2928	};
2726	}	2929	}
2727		2930
2728	$self->reorder;	2931	$self->reorder;
2729	}	2932	}
2730		2933
		2934	sub reconfigure {
		2935	my ($self) = @_;
		2936
		2937	delete $_->{label}
		2938	for values %{ $self->{item} || {} };
		2939
		2940	$self->reorder;
		2941	$self->SUPER::reconfigure;
		2942	}
		2943
2731	#############################################################################	2944	#############################################################################
2732		2945
2733	package CFClient::UI::Root;	2946	package CFClient::UI::Root;
2734		2947
2735	our @ISA = CFClient::UI::Container::;	2948	our @ISA = CFClient::UI::Container::;
…		…
2765	}	2978	}
2766		2979
2767	sub size_allocate {	2980	sub size_allocate {
2768	my ($self, $w, $h) = @_;	2981	my ($self, $w, $h) = @_;
2769		2982
2770	my $old_w = $self->{old_w};
2771	my $old_h = $self->{old_h};
2772
2773	if ($old_w && $old_h) {
2774	for my $child ($self->children) {
2775	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2776	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2777	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2778	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2779	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2780	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2781	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2782	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2783	}
2784	}
2785
2786	for my $child ($self->children) {	2983	for my $child ($self->children) {
2787	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2984	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2788		2985
		2986	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2987	if exists $child->{req_x};
		2988
		2989	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2990	if exists $child->{req_y};
		2991
2789	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2992	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2790	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2993	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2994
2791	$child->configure ($X, $Y, $W, $H);	2995	$child->configure ($X, $Y, $W, $H);
2792	}	2996	}
2793
2794	$self->{old_w} = $w;
2795	$self->{old_h} = $h;
2796	}	2997	}
2797		2998
2798	sub coord2local {	2999	sub coord2local {
2799	my ($self, $x, $y) = @_;	3000	my ($self, $x, $y) = @_;
2800		3001
…		…
2813	$self->check_size;	3014	$self->check_size;
2814	$::WANT_REFRESH++;	3015	$::WANT_REFRESH++;
2815	}	3016	}
2816		3017
2817	sub add {	3018	sub add {
2818	my ($self, $child) = @_;	3019	my ($self, @children) = @_;
2819		3020
		3021	for (my @widgets = @children; my $w = pop @widgets; ) {
		3022	push @widgets, $w->children;
		3023	$w->{root} = $self;
		3024	$w->{visible} = 1;
		3025	}
		3026
		3027	for my $child (@children) {
		3028	$child->{is_toplevel} = 1;
		3029
2820	# integerise window positions	3030	# integerise window positions
2821	$child->{x} = int $child->{x};	3031	$child->{x} = int $child->{x};
2822	$child->{y} = int $child->{y};	3032	$child->{y} = int $child->{y};
		3033	}
2823		3034
2824	$self->SUPER::add ($child);	3035	$self->SUPER::add (@children);
		3036	}
		3037
		3038	sub remove {
		3039	my ($self, @children) = @_;
		3040
		3041	$self->SUPER::remove (@children);
		3042
		3043	while (@children) {
		3044	my $w = pop @children;
		3045	push @children, $w->children;
		3046	$w->set_invisible;
		3047	}
2825	}	3048	}
2826		3049
2827	sub on_refresh {	3050	sub on_refresh {
2828	my ($self, $id, $cb) = @_;	3051	my ($self, $id, $cb) = @_;
2829		3052
…		…
2882	$w = 0 if $w < 0;	3105	$w = 0 if $w < 0;
2883	$h = 0 if $h < 0;	3106	$h = 0 if $h < 0;
2884		3107
2885	$widget->{w} = $w;	3108	$widget->{w} = $w;
2886	$widget->{h} = $h;	3109	$widget->{h} = $h;
2887	$widget->size_allocate ($w, $h);
2888	$widget->emit (size_allocate => $w, $h);	3110	$widget->emit (size_allocate => $w, $h);
2889	}	3111	}
2890	}	3112	}
2891		3113
2892	while ($self->{post_alloc_hook}) {	3114	while ($self->{post_alloc_hook}) {
…		…
2898	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3120	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2899	glClear GL_COLOR_BUFFER_BIT;	3121	glClear GL_COLOR_BUFFER_BIT;
2900		3122
2901	glMatrixMode GL_PROJECTION;	3123	glMatrixMode GL_PROJECTION;
2902	glLoadIdentity;	3124	glLoadIdentity;
2903	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3125	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2904	glMatrixMode GL_MODELVIEW;	3126	glMatrixMode GL_MODELVIEW;
2905	glLoadIdentity;	3127	glLoadIdentity;
2906		3128
2907	$self->_draw;	3129	$self->_draw;
2908	}	3130	}
…		…
2910	#############################################################################	3132	#############################################################################
2911		3133
2912	package CFClient::UI;	3134	package CFClient::UI;
2913		3135
2914	$ROOT = new CFClient::UI::Root;	3136	$ROOT = new CFClient::UI::Root;
2915	$TOOLTIP = new CFClient::UI::Tooltip;	3137	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2916		3138
2917	1	3139	1
2918		3140

Diff Legend

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