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.239 by root, Thu May 25 22:29:57 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 update {
		882	my ($self) = @_;
		883
		884	$self->SUPER::update;
		885
		886	# todo: overwrite size_allocate of child
		887	my $child = $self->{vp}->child;
		888	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		889	}
		890
		891	sub size_allocate {
		892	my ($self, $w, $h) = @_;
		893
		894	$self->SUPER::size_allocate ($w, $h);
		895
		896	my $child = $self->{vp}->child;
		897	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
800	}	898	}
801		899
802	#TODO# update range on size_allocate depending on child	900	#TODO# update range on size_allocate depending on child
803	# update viewport offset on scroll	901	# update viewport offset on scroll
804		902
…		…
858	my $class = shift;	956	my $class = shift;
859		957
860	# TODO: user_x, user_y, overwrite moveto?	958	# TODO: user_x, user_y, overwrite moveto?
861		959
862	my $self = $class->SUPER::new (	960	my $self = $class->SUPER::new (
863	bg => [1, 1, 1, 1],	961	bg => [1, 1, 1, 1],
864	border_bg => [1, 1, 1, 1],	962	border_bg => [1, 1, 1, 1],
865	border => 0.6,	963	border => 0.6,
866	toplevel => 1,	964	is_toplevel => 1,
867	can_events => 1,	965	can_events => 1,
868	@_	966	@_
869	);	967	);
870		968
871	$self->{title} &&= new CFClient::UI::Label	969	$self->{title} &&= new CFClient::UI::Label
872	align => 0,	970	align => 0,
…		…
896	my ($self, $w, $h) = @_;	994	my ($self, $w, $h) = @_;
897		995
898	$h -= List::Util::max 0, $self->border * 2;	996	$h -= List::Util::max 0, $self->border * 2;
899	$w -= List::Util::max 0, $self->border * 2;	997	$w -= List::Util::max 0, $self->border * 2;
900		998
901	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	999	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
902	if $self->{title};	1000	if $self->{title};
903		1001
904	$self->child->configure ($self->border, $self->border, $w, $h);	1002	$self->child->configure ($self->border, $self->border, $w, $h);
905	}	1003	}
906		1004
…		…
1012	sub new {	1110	sub new {
1013	my $class = shift;	1111	my $class = shift;
1014		1112
1015	$class->SUPER::new (	1113	$class->SUPER::new (
1016	col_expand => [],	1114	col_expand => [],
1017	@_	1115	@_,
1018	)	1116	)
		1117	}
		1118
		1119	sub children {
		1120	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019	}	1121	}
1020		1122
1021	sub add {	1123	sub add {
1022	my ($self, $x, $y, $child) = @_;	1124	my ($self, $x, $y, $child) = @_;
1023		1125
1024	$child->set_parent ($self);	1126	$child->set_parent ($self);
1025	$self->{children}[$y][$x] = $child;	1127	$self->{children}[$y][$x] = $child;
1026		1128
1027	$child->check_size;	1129	$self->check_size (1);
1028	}	1130	}
1029		1131
1030	sub children {
1031	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032	}
1033
1034	# TODO: move to container class maybe? send childs a signal on removal?	1132	# TODO: move to container class maybe? send children a signal on removal?
1035	sub clear {	1133	sub clear {
1036	my ($self) = @_;	1134	my ($self) = @_;
1037		1135
1038	my @children = $self->children;	1136	my @children = $self->children;
1039	delete $self->{children};	1137	delete $self->{children};
…		…
1041	for (@children) {	1139	for (@children) {
1042	delete $_->{parent};	1140	delete $_->{parent};
1043	$_->hide;	1141	$_->hide;
1044	}	1142	}
1045		1143
		1144	$self->check_size (1);
1046	$self->update;	1145	$self->update;
1047	}	1146	}
1048		1147
1049	sub get_wh {	1148	sub get_wh {
1050	my ($self) = @_;	1149	my ($self) = @_;
…		…
1082	sub size_allocate {	1181	sub size_allocate {
1083	my ($self, $w, $h) = @_;	1182	my ($self, $w, $h) = @_;
1084		1183
1085	my ($ws, $hs) = $self->get_wh;	1184	my ($ws, $hs) = $self->get_wh;
1086		1185
1087	my $req_w = sum @$ws;	1186	my $req_w = (sum @$ws) || 1;
1088	my $req_h = sum @$hs;	1187	my $req_h = (sum @$hs) || 1;
1089		1188
1090	# TODO: nicer code && do row_expand	1189	# TODO: nicer code && do row_expand
1091	my @col_expand = @{$self->{col_expand}};	1190	my @col_expand = @{$self->{col_expand}};
1092	@col_expand = (1) x @$ws unless @col_expand;	1191	@col_expand = (1) x @$ws unless @col_expand;
1093	my $col_expand = (sum @col_expand) || 1;	1192	my $col_expand = (sum @col_expand) || 1;
…		…
1267		1366
1268	#############################################################################	1367	#############################################################################
1269		1368
1270	package CFClient::UI::Label;	1369	package CFClient::UI::Label;
1271		1370
1272	our @ISA = CFClient::UI::Base::;	1371	our @ISA = CFClient::UI::DrawBG::;
1273		1372
1274	use CFClient::OpenGL;	1373	use CFClient::OpenGL;
1275		1374
1276	sub new {	1375	sub new {
1277	my ($class, %arg) = @_;	1376	my ($class, %arg) = @_;
1278		1377
1279	my $self = $class->SUPER::new (	1378	my $self = $class->SUPER::new (
1280	fg => [1, 1, 1],	1379	fg => [1, 1, 1],
		1380	#bg => none
		1381	#active_bg => none
1281	#font => default_font	1382	#font => default_font
1282	#text => initial text	1383	#text => initial text
1283	#markup => initial narkup	1384	#markup => initial narkup
		1385	#max_w => maximum pixel width
		1386	ellipsise => 3, # end
1284	layout => (new CFClient::Layout),	1387	layout => (new CFClient::Layout),
1285	fontsize => 1,	1388	fontsize => 1,
1286	align => -1,	1389	align => -1,
1287	valign => -1,	1390	valign => -1,
1288	padding => 2,	1391	padding => 2,
…		…
1303	}	1406	}
1304		1407
1305	$self	1408	$self
1306	}	1409	}
1307		1410
1308	sub escape {	1411	sub escape($) {
1309	local $_ = $_[1];	1412	local $_ = $_[0];
1310		1413
1311	s/&/&amp;/g;	1414	s/&/&amp;/g;
1312	s/>/&gt;/g;	1415	s/>/&gt;/g;
1313	s/</&lt;/g;	1416	s/</&lt;/g;
1314		1417
1315	$_[1]	1418	$_
1316	}	1419	}
1317		1420
1318	sub update {	1421	sub update {
1319	my ($self) = @_;	1422	my ($self) = @_;
1320		1423
…		…
1353	sub size_request {	1456	sub size_request {
1354	my ($self) = @_;	1457	my ($self) = @_;
1355		1458
1356	$self->{layout}->set_font ($self->{font}) if $self->{font};	1459	$self->{layout}->set_font ($self->{font}) if $self->{font};
1357	$self->{layout}->set_width ($self->{max_w} || -1);	1460	$self->{layout}->set_width ($self->{max_w} || -1);
		1461	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1462	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1463	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359		1464
1360	my ($w, $h) = $self->{layout}->size;	1465	my ($w, $h) = $self->{layout}->size;
1361		1466
1362	if (exists $self->{template}) {	1467	if (exists $self->{template}) {
…		…
1392	}	1497	}
1393		1498
1394	sub _draw {	1499	sub _draw {
1395	my ($self) = @_;	1500	my ($self) = @_;
1396		1501
		1502	$self->SUPER::_draw; # draw background, if applicable
		1503
1397	my $tex = $self->{texture} ||= do {	1504	my $tex = $self->{texture} ||= do {
1398	$self->{layout}->set_foreground (@{$self->{fg}});	1505	$self->{layout}->set_foreground (@{$self->{fg}});
1399	$self->{layout}->set_font ($self->{font}) if $self->{font};	1506	$self->{layout}->set_font ($self->{font}) if $self->{font};
1400	$self->{layout}->set_width ($self->{w});	1507	$self->{layout}->set_width ($self->{w});
		1508	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1509	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1510	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402		1511
1403	my $tex = new_from_layout CFClient::Texture $self->{layout};	1512	my $tex = new_from_layout CFClient::Texture $self->{layout};
1404		1513
1405	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1514	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1406	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1515	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407	: ($self->{w} - $tex->{w}) * 0.5;	1516	: ($self->{w} - $tex->{w}) * 0.5);
1408		1517
1409	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1518	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1410	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1519	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411	: ($self->{h} - $tex->{h}) * 0.5;	1520	: ($self->{h} - $tex->{h}) * 0.5);
1412		1521
1413	$tex	1522	$tex
1414	};	1523	};
1415		1524
1416	glEnable GL_TEXTURE_2D;	1525	glEnable GL_TEXTURE_2D;
…		…
1444	active_fg => [0, 0, 0],	1553	active_fg => [0, 0, 0],
1445	can_hover => 1,	1554	can_hover => 1,
1446	can_focus => 1,	1555	can_focus => 1,
1447	valign => 0,	1556	valign => 0,
1448	can_events => 1,	1557	can_events => 1,
		1558	#text => ...
1449	@_	1559	@_
1450	)	1560	)
1451	}	1561	}
1452		1562
1453	sub _set_text {	1563	sub _set_text {
…		…
1463	$self->{text} = $text;	1573	$self->{text} = $text;
1464		1574
1465	$text =~ s/./*/g if $self->{hidden};	1575	$text =~ s/./*/g if $self->{hidden};
1466	$self->{layout}->set_text ("$text ");	1576	$self->{layout}->set_text ("$text ");
1467		1577
1468	$self->emit (changed => $self->{text});	1578	$self->_emit (changed => $self->{text});
1469	}	1579	}
1470		1580
1471	sub set_text {	1581	sub set_text {
1472	my ($self, $text) = @_;	1582	my ($self, $text) = @_;
1473		1583
1474	$self->{cursor} = length $text;	1584	$self->{cursor} = length $text;
1475	$self->_set_text ($text);	1585	$self->_set_text ($text);
		1586	$self->update;
1476	$self->check_size;	1587	$self->check_size;
1477	$self->update;
1478	}	1588	}
1479		1589
1480	sub get_text {	1590	sub get_text {
1481	$_[0]{text}	1591	$_[0]{text}
1482	}	1592	}
…		…
1485	my ($self) = @_;	1595	my ($self) = @_;
1486		1596
1487	my ($w, $h) = $self->SUPER::size_request;	1597	my ($w, $h) = $self->SUPER::size_request;
1488		1598
1489	($w + 1, $h) # add 1 for cursor	1599	($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	}	1600	}
1497		1601
1498	sub key_down {	1602	sub key_down {
1499	my ($self, $ev) = @_;	1603	my ($self, $ev) = @_;
1500		1604
…		…
1515	} elsif ($sym == CFClient::SDLK_HOME) {	1619	} elsif ($sym == CFClient::SDLK_HOME) {
1516	$self->{cursor} = 0;	1620	$self->{cursor} = 0;
1517	} elsif ($sym == CFClient::SDLK_END) {	1621	} elsif ($sym == CFClient::SDLK_END) {
1518	$self->{cursor} = length $text;	1622	$self->{cursor} = length $text;
1519	} elsif ($uni == 27) {	1623	} elsif ($uni == 27) {
1520	$self->emit ('escape');	1624	$self->_emit ('escape');
1521	} elsif ($uni) {	1625	} elsif ($uni) {
1522	substr $text, $self->{cursor}++, 0, chr $uni;	1626	substr $text, $self->{cursor}++, 0, chr $uni;
1523	}	1627	}
1524		1628
1525	$self->_set_text ($text);	1629	$self->_set_text ($text);
1526	$self->update;	1630	$self->update;
		1631	$self->check_size;
1527	}	1632	}
1528		1633
1529	sub focus_in {	1634	sub focus_in {
1530	my ($self) = @_;	1635	my ($self) = @_;
1531		1636
…		…
1611	if ($sym == 13) {	1716	if ($sym == 13) {
1612	unshift @{$self->{history}},	1717	unshift @{$self->{history}},
1613	my $txt = $self->get_text;	1718	my $txt = $self->get_text;
1614	$self->{history_pointer} = -1;	1719	$self->{history_pointer} = -1;
1615	$self->{history_saveback} = '';	1720	$self->{history_saveback} = '';
1616	$self->emit (activate => $txt);	1721	$self->_emit (activate => $txt);
1617	$self->update;	1722	$self->update;
1618		1723
1619	} elsif ($sym == CFClient::SDLK_UP) {	1724	} elsif ($sym == CFClient::SDLK_UP) {
1620	if ($self->{history_pointer} < 0) {	1725	if ($self->{history_pointer} < 0) {
1621	$self->{history_saveback} = $self->get_text;	1726	$self->{history_saveback} = $self->get_text;
…		…
1660	my $class = shift;	1765	my $class = shift;
1661		1766
1662	$class->SUPER::new (	1767	$class->SUPER::new (
1663	padding => 4,	1768	padding => 4,
1664	fg => [1, 1, 1],	1769	fg => [1, 1, 1],
1665	bg => [1, 1, 1, 0.2],
1666	active_fg => [0, 0, 1],	1770	active_fg => [0, 0, 1],
1667	can_hover => 1,	1771	can_hover => 1,
1668	align => 0,	1772	align => 0,
1669	valign => 0,	1773	valign => 0,
1670	can_events => 1,	1774	can_events => 1,
1671	@_	1775	@_
1672	)	1776	)
1673	}	1777	}
1674		1778
		1779	sub activate { }
		1780
1675	sub button_up {	1781	sub button_up {
1676	my ($self, $ev, $x, $y) = @_;	1782	my ($self, $ev, $x, $y) = @_;
1677		1783
		1784	$self->emit ("activate")
1678	if ($x >= 0 && $x < $self->{w}	1785	if $x >= 0 && $x < $self->{w}
1679	&& $y >= 0 && $y < $self->{h}) {	1786	&& $y >= 0 && $y < $self->{h};
1680	$self->emit ("activate");
1681	}
1682	}	1787	}
1683		1788
1684	sub _draw {	1789	sub _draw {
1685	my ($self) = @_;	1790	my ($self) = @_;
1686		1791
…		…
1718		1823
1719	$class->SUPER::new (	1824	$class->SUPER::new (
1720	padding => 2,	1825	padding => 2,
1721	fg => [1, 1, 1],	1826	fg => [1, 1, 1],
1722	active_fg => [1, 1, 0],	1827	active_fg => [1, 1, 0],
		1828	bg => [0, 0, 0, 0.2],
		1829	active_bg => [1, 1, 1, 0.5],
1723	state => 0,	1830	state => 0,
1724	can_hover => 1,	1831	can_hover => 1,
1725	@_	1832	@_
1726	)	1833	)
1727	}	1834	}
…		…
1736	my ($self, $ev, $x, $y) = @_;	1843	my ($self, $ev, $x, $y) = @_;
1737		1844
1738	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1845	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1739	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1846	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1740	$self->{state} = !$self->{state};	1847	$self->{state} = !$self->{state};
1741	$self->emit (changed => $self->{state});	1848	$self->_emit (changed => $self->{state});
1742	}	1849	}
1743	}	1850	}
1744		1851
1745	sub _draw {	1852	sub _draw {
1746	my ($self) = @_;	1853	my ($self) = @_;
…		…
2011	qw(s1_slider.png s1_slider_bg.png);	2118	qw(s1_slider.png s1_slider_bg.png);
2012		2119
2013	sub new {	2120	sub new {
2014	my $class = shift;	2121	my $class = shift;
2015		2122
2016	# range [value, low, high, page]	2123	# range [value, low, high, page, unit]
2017		2124
2018	# TODO: 0-width page	2125	# TODO: 0-width page
2019	# TODO: req_w/h are wrong with vertical	2126	# TODO: req_w/h are wrong with vertical
2020	# TODO: calculations are off	2127	# TODO: calculations are off
2021	my $self = $class->SUPER::new (	2128	my $self = $class->SUPER::new (
2022	fg => [1, 1, 1],	2129	fg => [1, 1, 1],
2023	active_fg => [0, 0, 0],	2130	active_fg => [0, 0, 0],
		2131	bg => [0, 0, 0, 0.2],
		2132	active_bg => [1, 1, 1, 0.5],
2024	range => [0, 0, 100, 10],	2133	range => [0, 0, 100, 10, 0],
2025	req_w => $::WIDTH / 80,	2134	req_w => $::WIDTH / 80,
2026	req_h => $::WIDTH / 80,	2135	req_h => $::WIDTH / 80,
2027	vertical => 0,	2136	vertical => 0,
2028	can_hover => 1,	2137	can_hover => 1,
2029	inner_pad => 5,	2138	inner_pad => 0.02,
2030	@_	2139	@_
2031	);	2140	);
2032		2141
		2142	$self->set_value ($self->{range}[0]);
		2143	$self->update;
		2144
2033	$self	2145	$self
		2146	}
		2147
		2148	sub set_range {
		2149	my ($self, $range) = @_;
		2150
		2151	($range, $self->{range}) = ($self->{range}, $range);
		2152
		2153	$self->update
		2154	if "@$range" ne "@{$self->{range}}";
		2155	}
		2156
		2157	sub set_value {
		2158	my ($self, $value) = @_;
		2159
		2160	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2161
		2162	$hi = $lo + 1 if $hi <= $lo;
		2163
		2164	$page = $hi - $lo if $page > $hi - $lo;
		2165
		2166	$value = $lo if $value < $lo;
		2167	$value = $hi - $page if $value > $hi - $page;
		2168
		2169	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2170	if $unit;
		2171
		2172	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2173
		2174	if ($value != $old_value) {
		2175	$self->_emit (changed => $value);
		2176	$self->update;
		2177	}
2034	}	2178	}
2035		2179
2036	sub size_request {	2180	sub size_request {
2037	my ($self) = @_;	2181	my ($self) = @_;
2038		2182
…		…
2044		2188
2045	sub button_down {	2189	sub button_down {
2046	my ($self, $ev, $x, $y) = @_;	2190	my ($self, $ev, $x, $y) = @_;
2047		2191
2048	$self->SUPER::button_down ($ev, $x, $y);	2192	$self->SUPER::button_down ($ev, $x, $y);
		2193
		2194	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2195
2049	$self->mouse_motion ($ev, $x, $y);	2196	$self->mouse_motion ($ev, $x, $y);
2050	}	2197	}
2051		2198
2052	sub mouse_motion {	2199	sub mouse_motion {
2053	my ($self, $ev, $x, $y) = @_;	2200	my ($self, $ev, $x, $y) = @_;
2054		2201
2055	if ($GRAB == $self) {	2202	if ($GRAB == $self) {
		2203	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2204
		2205	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2206
		2207	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2208
		2209	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2210	}
		2211	}
		2212
		2213	sub update {
		2214	my ($self) = @_;
		2215
		2216	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2217	$self->set_value ($self->{range}[0]);
		2218
2056	my ($value, $lo, $hi, $page) = @{$self->{range}};	2219	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2220	my $range = ($hi - $page - $lo) || 1e-100;
2057		2221
2058	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2222	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059		2223
2060	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2224	$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	2225	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062		2226
2063	$x -= $inner_pad_px; # substract the padding	2227	$value = ($value - $lo) / $range;
2064	$x = $x * ($hi - $lo) / $inner_w + $lo;	2228	$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		2229
2069	$self->emit (changed => $x);	2230	$self->{knob_x} = $value - $knob_w * 0.5;
2070	$self->update;	2231	$self->{knob_w} = $knob_w;
2071	}	2232	});
2072	}
2073		2233
2074	# the inner_* stuff is for generating a padding for the slider handle,	2234	$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	}	2235	}
2081		2236
2082	sub _draw {	2237	sub _draw {
2083	my ($self) = @_;	2238	my ($self) = @_;
2084		2239
2085	$self->SUPER::_draw ();	2240	$self->SUPER::_draw ();
2086		2241
2087	my ($w, $h) = @$self{qw(w h)};	2242	glScale $self->{w}, $self->{h};
2088		2243
2089	if ($self->{vertical}) {	2244	if ($self->{vertical}) {
2090	# draw a vertical slider like a rotated horizontal slider	2245	# draw a vertical slider like a rotated horizontal slider
2091		2246
		2247	glTranslate 1, 0, 0;
2092	glRotate 90, 0, 0, 1;	2248	glRotate 90, 0, 0, 1;
2093	glTranslate 0, -$self->{w}, 0;
2094
2095	($w, $h) = ($h, $w);
2096	}	2249	}
2097		2250
2098	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2251	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2252	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100		2253
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;	2254	glEnable GL_TEXTURE_2D;
2120	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2255	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121		2256
2122	# draw background	2257	# draw background
2123	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2258	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124		2259
2125	# draw handle	2260	# draw handle
2126	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2261	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127		2262
2128	glDisable GL_TEXTURE_2D;	2263	glDisable GL_TEXTURE_2D;
2129	}	2264	}
		2265
		2266	#############################################################################
		2267
		2268	package CFClient::UI::ValSlider;
		2269
		2270	our @ISA = CFClient::UI::HBox::;
		2271
		2272	sub new {
		2273	my ($class, %arg) = @_;
		2274
		2275	my $range = delete $arg{range};
		2276
		2277	my $self = $class->SUPER::new (
		2278	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2279	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2280	to_value => sub { shift },
		2281	from_value => sub { shift },
		2282	%arg,
		2283	);
		2284
		2285	$self->{slider}->connect (changed => sub {
		2286	my ($self, $value) = @_;
		2287	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2288	$self->{parent}->emit (changed => $value);
		2289	});
		2290
		2291	# $self->{entry}->connect (changed => sub {
		2292	# my ($self, $value) = @_;
		2293	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2294	# $self->{parent}->emit (changed => $value);
		2295	# });
		2296
		2297	$self->add ($self->{slider}, $self->{entry});
		2298
		2299	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2300
		2301	$self
		2302	}
		2303
		2304	sub set_range { shift->{slider}->set_range (@_) }
		2305	sub set_value { shift->{slider}->set_value (@_) }
2130		2306
2131	#############################################################################	2307	#############################################################################
2132		2308
2133	package CFClient::UI::TextView;	2309	package CFClient::UI::TextView;
2134		2310
…		…
2164		2340
2165	$self->{fontsize} = $fontsize;	2341	$self->{fontsize} = $fontsize;
2166	$self->reflow;	2342	$self->reflow;
2167	}	2343	}
2168		2344
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 {	2345	sub size_allocate {
2189	my ($self, $w, $h) = @_;	2346	my ($self, $w, $h) = @_;
2190		2347
2191	$self->SUPER::size_allocate ($w, $h);	2348	$self->SUPER::size_allocate ($w, $h);
2192		2349
…		…
2195	$self->{layout}->set_width ($self->{children}[0]{w});	2352	$self->{layout}->set_width ($self->{children}[0]{w});
2196		2353
2197	$self->reflow;	2354	$self->reflow;
2198	}	2355	}
2199		2356
		2357	sub text_size {
		2358	my ($self, $text, $indent) = @_;
		2359
		2360	my $layout = $self->{layout};
		2361
		2362	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2363	$layout->set_width ($self->{children}[0]{w} - $indent);
		2364	$layout->set_markup ($text);
		2365
		2366	$layout->size
		2367	}
		2368
		2369	sub reflow {
		2370	my ($self) = @_;
		2371
		2372	$self->{need_reflow}++;
		2373	$self->update;
		2374	}
		2375
		2376	sub set_offset {
		2377	my ($self, $offset) = @_;
		2378
		2379	# todo: base offset on lines or so, not on pixels
		2380	$self->{children}[1]->set_value ($offset);
		2381	}
		2382
		2383	sub clear {
		2384	my ($self) = @_;
		2385
		2386	$self->{par} = [];
		2387	$self->{height} = 0;
		2388	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2389	}
		2390
2200	sub add_paragraph {	2391	sub add_paragraph {
2201	my ($self, $color, $text) = @_;	2392	my ($self, $color, $text, $indent) = @_;
2202		2393
2203	#TODO: intelligently "reformat" paragraph	2394	for my $line (split /\n/, $text) {
2204		2395	my ($w, $h) = $self->text_size ($line);
2205	my $height = $self->text_height ($text);
2206
2207	$self->{height} += $height;	2396	$self->{height} += $h;
		2397	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2398	}
2208		2399
2209	push @{$self->{par}}, [$height, $color, $text];
2210
2211	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2400	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2212	$self->{children}[1]->update;
2213	}	2401	}
2214		2402
2215	sub update {	2403	sub update {
2216	my ($self) = @_;	2404	my ($self) = @_;
2217		2405
…		…
2220	return unless $self->{h} > 0;	2408	return unless $self->{h} > 0;
2221		2409
2222	delete $self->{texture};	2410	delete $self->{texture};
2223		2411
2224	$ROOT->on_post_alloc ($self, sub {	2412	$ROOT->on_post_alloc ($self, sub {
		2413	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2414
2225	if (delete $self->{need_reflow}) {	2415	if (delete $self->{need_reflow}) {
2226	my $height = 0;	2416	my $height = 0;
2227		2417
2228	$height += $_->[0] = $self->text_height ($_->[2])	2418	my $layout = $self->{layout};
		2419
		2420	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2421
2229	for @{$self->{par}};	2422	for (@{$self->{par}}) {
		2423	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2424	$layout->set_width ($W - $_->[3]);
		2425	$layout->set_markup ($_->[4]);
		2426	my ($w, $h) = $layout->size;
		2427	$_->[0] = $w + $_->[3];
		2428	$_->[1] = $h;
		2429	}
		2430
		2431	$height += $_->[1];
		2432	}
2230		2433
2231	$self->{height} = $height;	2434	$self->{height} = $height;
2232		2435
2233	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2436	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234		2437
2235	delete $self->{texture};	2438	delete $self->{texture};
2236	}	2439	}
2237		2440
2238	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2441	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2239	glClearColor 0, 0, 0, 0;	2442	glClearColor 0.5, 0.5, 0.5, 0;
2240	glClear GL_COLOR_BUFFER_BIT;	2443	glClear GL_COLOR_BUFFER_BIT;
2241		2444
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];	2445	my $top = int $self->{children}[1]{range}[0];
2246		2446
2247	my $y0 = $top;	2447	my $y0 = $top;
2248	my $y1 = $top + $self->{h};	2448	my $y1 = $top + $H;
2249		2449
2250	my $y = 0;	2450	my $y = 0;
2251		2451
2252	my $layout = $self->{layout};	2452	my $layout = $self->{layout};
2253		2453
2254	$layout->set_font ($self->{font}) if $self->{font};	2454	$layout->set_font ($self->{font}) if $self->{font};
2255		2455
		2456	glEnable GL_BLEND;
		2457	#TODO# not correct in windows where rgba is forced off
		2458	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2459
2256	for my $par (@{$self->{par}}) {	2460	for my $par (@{$self->{par}}) {
2257	my $h = $par->[0];	2461	my $h = $par->[1];
2258		2462
2259	if ($y0 < $y + $h && $y < $y1) {	2463	if ($y0 < $y + $h && $y < $y1) {
2260	$layout->set_foreground (@{ $par->[1] });	2464	$layout->set_foreground (@{ $par->[2] });
		2465	$layout->set_width ($W - $par->[3]);
2261	$layout->set_markup ($par->[2]);	2466	$layout->set_markup ($par->[4]);
2262		2467
2263	my ($W, $H) = $layout->size;	2468	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2469
		2470	glRasterPos $par->[3], $y - $y0;
		2471	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265	}	2472	}
2266		2473
2267	$y += $h;	2474	$y += $h;
2268	}	2475	}
2269		2476
2270	glDisable GL_TEXTURE_2D;	2477	glDisable GL_BLEND;
2271	};	2478	};
2272	});	2479	});
2273	}	2480	}
2274		2481
2275	sub _draw {	2482	sub _draw {
2276	my ($self) = @_;	2483	my ($self) = @_;
2277		2484
2278	glEnable GL_TEXTURE_2D;	2485	glEnable GL_TEXTURE_2D;
2279	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2486	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280	glColor 1, 1, 1, 1;	2487	glColor 1, 1, 1, 1;
2281	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2488	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282	glDisable GL_TEXTURE_2D;	2489	glDisable GL_TEXTURE_2D;
2283		2490
2284	$self->{children}[1]->draw;	2491	$self->{children}[1]->draw;
2285		2492
2286	}	2493	}
…		…
2355		2562
2356	# TODO: use animation	2563	# TODO: use animation
2357	if ($self->{state} = !$self->{state}) {	2564	if ($self->{state} = !$self->{state}) {
2358	$CFClient::UI::ROOT->add ($self->{other});	2565	$CFClient::UI::ROOT->add ($self->{other});
2359	$self->{other}->move ($self->coord2global (0, $self->{h}));	2566	$self->{other}->move ($self->coord2global (0, $self->{h}));
2360	$self->emit ("open");	2567	$self->_emit ("open");
2361	} else {	2568	} else {
2362	$CFClient::UI::ROOT->remove ($self->{other});	2569	$CFClient::UI::ROOT->remove ($self->{other});
2363	$self->emit ("close");	2570	$self->_emit ("close");
2364	}	2571	}
2365		2572
2366	$self->emit (changed => $self->{state});	2573	$self->_emit (changed => $self->{state});
2367	}	2574	}
2368		2575
2369	#############################################################################	2576	#############################################################################
2370		2577
2371	package CFClient::UI::Tooltip;	2578	package CFClient::UI::Tooltip;
…		…
2385		2592
2386	sub set_tooltip_from {	2593	sub set_tooltip_from {
2387	my ($self, $widget) = @_;	2594	my ($self, $widget) = @_;
2388		2595
2389	$self->add (new CFClient::UI::Label	2596	$self->add (new CFClient::UI::Label
2390	markup => $widget->{tooltip},	2597	markup => $widget->{tooltip},
2391	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2598	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392	fontsize => 0.8,	2599	fontsize => 0.8,
2393	fg => [0, 0, 0, 1],	2600	fg => [0, 0, 0, 1],
		2601	ellipsise => 0,
2394	font => ($widget->{tooltip_font} || $::FONT_PROP),	2602	font => ($widget->{tooltip_font} || $::FONT_PROP),
2395	);	2603	);
2396	}	2604	}
2397		2605
2398	sub size_request {	2606	sub size_request {
2399	my ($self) = @_;	2607	my ($self) = @_;
…		…
2445	use CFClient::OpenGL;	2653	use CFClient::OpenGL;
2446		2654
2447	sub new {	2655	sub new {
2448	my $class = shift;	2656	my $class = shift;
2449		2657
2450	$class->SUPER::new (	2658	my $self = $class->SUPER::new (
2451	aspect => 1,	2659	aspect => 1,
		2660	can_events => 0,
2452	@_,	2661	@_,
2453	)	2662	);
		2663
		2664	if ($self->{anim} && $self->{animspeed}) {
		2665	Scalar::Util::weaken (my $widget = $self);
		2666
		2667	$self->{timer} = Event->timer (
		2668	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2669	hard => 1,
		2670	interval => $self->{animspeed},
		2671	cb => sub {
		2672	++$widget->{frame};
		2673	$widget->update;
		2674	},
		2675	);
		2676	}
		2677
		2678	$self
2454	}	2679	}
2455		2680
2456	sub size_request {	2681	sub size_request {
2457	(32, 8)	2682	(32, 8)
2458	}	2683	}
2459		2684
		2685	sub update {
		2686	my ($self) = @_;
		2687
		2688	return unless $self->{visible};
		2689
		2690	$self->SUPER::update;
		2691	}
		2692
2460	sub _draw {	2693	sub _draw {
2461	my ($self) = @_;	2694	my ($self) = @_;
2462		2695
2463	return unless $::CONN;#d# manage and cache textures differently	2696	return unless $::CONN;
		2697
		2698	my $face;
		2699
		2700	if ($self->{frame}) {
		2701	my $anim = $::CONN->{anim}[$self->{anim}];
		2702
		2703	$face = $anim->[ $self->{frame} % @$anim ]
		2704	if $anim && @$anim;
		2705	}
		2706
2464	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2707	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465		2708
2466	# TODO animation
2467	if ($tex) {	2709	if ($tex) {
2468	glEnable GL_TEXTURE_2D;	2710	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2711	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2712	glColor 1, 1, 1, 1;
2471	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2713	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2714	glDisable GL_TEXTURE_2D;
2473	}	2715	}
2474	}	2716	}
2475		2717
		2718	sub DESTROY {
		2719	my ($self) = @_;
		2720
		2721	$self->{timer}->cancel
		2722	if $self->{timer};
		2723
		2724	$self->SUPER::DESTROY;
		2725	}
		2726
2476	#############################################################################	2727	#############################################################################
2477		2728
2478	package CFClient::UI::InventoryItem;	2729	package CFClient::UI::Inventory;
2479		2730
2480	our @ISA = CFClient::UI::HBox::;	2731	our @ISA = CFClient::UI::ScrolledWindow::;
2481		2732
2482	sub new {	2733	sub new {
2483	my $class = shift;	2734	my $class = shift;
2484		2735
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 (	2736	my $self = $class->SUPER::new (
2495	can_hover => 1,	2737	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	@_,	2738	@_,
2554	);	2739	);
2555		2740
2556	$self	2741	$self
2557	}	2742	}
…		…
2567	or ($a->{name} cmp $b->{name})	2752	or ($a->{name} cmp $b->{name})
2568	} @$items;	2753	} @$items;
2569		2754
2570	$self->{real_items} = \@items;	2755	$self->{real_items} = \@items;
2571		2756
		2757	my $row = 0;
2572	for my $item (@items) {	2758	for my $item (@items) {
2573	my $desc = $item->{nrof} < 2	2759	CFClient::Item::update_widgets $item;
2574	? $item->{name}
2575	: "$item->{nrof} $item->{name_pl}";
2576		2760
2577	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2761	$self->{scrolled}->add (0, $row, $item->{face_widget});
2578	}	2762	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2763	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2579		2764
2580	$self->{scrolled}->add (@items);	2765	$row++;
2581		2766	}
2582	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583	}	2767	}
2584		2768
2585	sub size_request {	2769	sub size_request {
2586	my ($self) = @_;	2770	my ($self) = @_;
2587	($self->{req_w}, $self->{req_h});	2771	($self->{req_w}, $self->{req_h});
…		…
2627		2811
2628	# popup given the event (must be a mouse button down event currently)	2812	# popup given the event (must be a mouse button down event currently)
2629	sub popup {	2813	sub popup {
2630	my ($self, $ev) = @_;	2814	my ($self, $ev) = @_;
2631		2815
2632	$self->emit ("popdown");	2816	$self->_emit ("popdown");
2633		2817
2634	# maybe save $GRAB? must be careful about events...	2818	# maybe save $GRAB? must be careful about events...
2635	$GRAB = $self;	2819	$GRAB = $self;
2636	$self->{button} = $ev->{button};	2820	$self->{button} = $ev->{button};
2637		2821
…		…
2652		2836
2653	if ($ev->{button} == $self->{button}) {	2837	if ($ev->{button} == $self->{button}) {
2654	undef $GRAB;	2838	undef $GRAB;
2655	$self->hide;	2839	$self->hide;
2656		2840
2657	$self->emit ("popdown");	2841	$self->_emit ("popdown");
2658	$self->{hover}[1]->() if $self->{hover};	2842	$self->{hover}[1]->() if $self->{hover};
2659	}	2843	}
2660	}	2844	}
2661		2845
2662	#############################################################################	2846	#############################################################################
2663		2847
2664	package CFClient::UI::Statusbox;	2848	package CFClient::UI::Statusbox;
2665		2849
2666	our @ISA = CFClient::UI::VBox::;	2850	our @ISA = CFClient::UI::VBox::;
		2851
		2852	sub new {
		2853	my $class = shift;
		2854
		2855	$class->SUPER::new (
		2856	fontsize => 0.8,
		2857	@_,
		2858	)
		2859	}
2667		2860
2668	sub reorder {	2861	sub reorder {
2669	my ($self) = @_;	2862	my ($self) = @_;
2670	my $NOW = time;	2863	my $NOW = time;
2671		2864
…		…
2690	? "<b>$item->{count} ×</b> $item->{text}"	2883	? "<b>$item->{count} ×</b> $item->{text}"
2691	: $item->{text};	2884	: $item->{text};
2692		2885
2693	for ($short) {	2886	for ($short) {
2694	s/^\s+//;	2887	s/^\s+//;
2695	s/\012.*/…/s;	2888	s/\s+/ /g;
2696	my $len = int 40 / $item->{fontsize};
2697	substr $_, $len, length, "…" if $len < length;
2698	}	2889	}
2699		2890
2700	new CFClient::UI::Label	2891	new CFClient::UI::Label
2701	markup => $short,	2892	markup => $short,
2702	tooltip => $item->{tooltip},	2893	tooltip => $item->{tooltip},
2703	tooltip_font => $::FONT_PROP,	2894	tooltip_font => $::FONT_PROP,
2704	tooltip_width => 0.67,	2895	tooltip_width => 0.67,
2705	fontsize => $item->{fontsize},	2896	fontsize => $item->{fontsize} || $self->{fontsize},
		2897	max_w => $::WIDTH * 0.44,
2706	color => $item->{color},	2898	fg => $item->{fg},
2707	can_events => 1,	2899	can_events => 1,
2708	can_hover => 1	2900	can_hover => 1
2709	};	2901	};
2710	}	2902	}
2711		2903
…		…
2716	sub add {	2908	sub add {
2717	my ($self, $text, %arg) = @_;	2909	my ($self, $text, %arg) = @_;
2718		2910
2719	$text =~ s/^\s+//;	2911	$text =~ s/^\s+//;
2720	$text =~ s/\s+$//;	2912	$text =~ s/\s+$//;
		2913
		2914	return unless $text;
2721		2915
2722	my $timeout = time + ((delete $arg{timeout}) || 60);	2916	my $timeout = time + ((delete $arg{timeout}) || 60);
2723		2917
2724	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2918	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725		2919
…		…
2737	$self->{item}{$group} = {	2931	$self->{item}{$group} = {
2738	id => ++$self->{id},	2932	id => ++$self->{id},
2739	text => $text,	2933	text => $text,
2740	timeout => $timeout,	2934	timeout => $timeout,
2741	tooltip => $text,	2935	tooltip => $text,
2742	fontsize => 0.8,
2743	color => [0.8, 0.8, 0.8, 0.8],	2936	fg => [0.8, 0.8, 0.8, 0.8],
2744	pri => 0,	2937	pri => 0,
2745	count => 1,	2938	count => 1,
2746	%arg,	2939	%arg,
2747	};	2940	};
2748	}	2941	}
2749		2942
2750	$self->reorder;	2943	$self->reorder;
2751	}	2944	}
2752		2945
		2946	sub reconfigure {
		2947	my ($self) = @_;
		2948
		2949	delete $_->{label}
		2950	for values %{ $self->{item} || {} };
		2951
		2952	$self->reorder;
		2953	$self->SUPER::reconfigure;
		2954	}
		2955
2753	#############################################################################	2956	#############################################################################
2754		2957
2755	package CFClient::UI::Root;	2958	package CFClient::UI::Root;
2756		2959
2757	our @ISA = CFClient::UI::Container::;	2960	our @ISA = CFClient::UI::Container::;
…		…
2787	}	2990	}
2788		2991
2789	sub size_allocate {	2992	sub size_allocate {
2790	my ($self, $w, $h) = @_;	2993	my ($self, $w, $h) = @_;
2791		2994
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) {	2995	for my $child ($self->children) {
2799	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2996	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800		2997
		2998	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2999	if exists $child->{req_x};
		3000
		3001	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3002	if exists $child->{req_y};
		3003
2801	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3004	$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;	3005	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3006
2803	$child->configure ($X, $Y, $W, $H);	3007	$child->configure ($X, $Y, $W, $H);
2804	}	3008	}
2805	}	3009	}
2806		3010
2807	sub coord2local {	3011	sub coord2local {
…		…
2824	}	3028	}
2825		3029
2826	sub add {	3030	sub add {
2827	my ($self, @children) = @_;	3031	my ($self, @children) = @_;
2828		3032
		3033	for (my @widgets = @children; my $w = pop @widgets; ) {
		3034	push @widgets, $w->children;
		3035	$w->{root} = $self;
		3036	$w->{visible} = 1;
		3037	}
		3038
2829	for my $child (@children) {	3039	for my $child (@children) {
2830	$child->{toplevel} = 1;	3040	$child->{is_toplevel} = 1;
2831		3041
2832	# integerise window positions	3042	# integerise window positions
2833	$child->{x} = int $child->{x};	3043	$child->{x} = int $child->{x};
2834	$child->{y} = int $child->{y};	3044	$child->{y} = int $child->{y};
2835	}	3045	}
2836		3046
2837	$self->SUPER::add (@children);	3047	$self->SUPER::add (@children);
		3048	}
		3049
		3050	sub remove {
		3051	my ($self, @children) = @_;
		3052
		3053	$self->SUPER::remove (@children);
		3054
		3055	while (@children) {
		3056	my $w = pop @children;
		3057	push @children, $w->children;
		3058	$w->set_invisible;
		3059	}
2838	}	3060	}
2839		3061
2840	sub on_refresh {	3062	sub on_refresh {
2841	my ($self, $id, $cb) = @_;	3063	my ($self, $id, $cb) = @_;
2842		3064
…		…
2895	$w = 0 if $w < 0;	3117	$w = 0 if $w < 0;
2896	$h = 0 if $h < 0;	3118	$h = 0 if $h < 0;
2897		3119
2898	$widget->{w} = $w;	3120	$widget->{w} = $w;
2899	$widget->{h} = $h;	3121	$widget->{h} = $h;
2900	$widget->size_allocate ($w, $h);
2901	$widget->emit (size_allocate => $w, $h);	3122	$widget->emit (size_allocate => $w, $h);
2902	}	3123	}
2903	}	3124	}
2904		3125
2905	while ($self->{post_alloc_hook}) {	3126	while ($self->{post_alloc_hook}) {
…		…
2911	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3132	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912	glClear GL_COLOR_BUFFER_BIT;	3133	glClear GL_COLOR_BUFFER_BIT;
2913		3134
2914	glMatrixMode GL_PROJECTION;	3135	glMatrixMode GL_PROJECTION;
2915	glLoadIdentity;	3136	glLoadIdentity;
2916	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3137	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917	glMatrixMode GL_MODELVIEW;	3138	glMatrixMode GL_MODELVIEW;
2918	glLoadIdentity;	3139	glLoadIdentity;
2919		3140
2920	$self->_draw;	3141	$self->_draw;
2921	}	3142	}
…		…
2923	#############################################################################	3144	#############################################################################
2924		3145
2925	package CFClient::UI;	3146	package CFClient::UI;
2926		3147
2927	$ROOT = new CFClient::UI::Root;	3148	$ROOT = new CFClient::UI::Root;
2928	$TOOLTIP = new CFClient::UI::Tooltip;	3149	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929		3150
2930	1	3151	1
2931		3152

Diff Legend

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