ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

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

Diff Legend

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