ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.201 by root, Sat May 13 23:17:49 2006 UTC vs.
Revision 1.239 by root, Thu May 25 22:29:57 2006 UTC

…		…
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		12
13	our $ROOT;	13	our $ROOT;
14	our $TOOLTIP;	14	our $TOOLTIP;
15	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
16		18
17	sub check_tooltip {	19	sub check_tooltip {
18	if (!$GRAB) {	20	if (!$GRAB) {
19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
29	$TOOLTIP->set_tooltip_from ($widget);	31	$TOOLTIP->set_tooltip_from ($widget);
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
39	$TOOLTIP->check_size;	40	$TOOLTIP->check_size;
40	$TOOLTIP->update;	41	$TOOLTIP->update;
41	}	42	}
…		…
49	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
50	}	51	}
51		52
52	# class methods for events	53	# class methods for events
53	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
54	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	55	$FOCUS->emit (key_down => $_[0])
55	if $FOCUS;	56	if $FOCUS;
56	}	57	}
57		58
58	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
59	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	60	$FOCUS->emit (key_up => $_[0])
60	if $FOCUS;	61	if $FOCUS;
61	}	62	}
62		63
63	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
64	my ($ev) = @_;	65	my ($ev) = @_;
…		…
73	check_tooltip;	74	check_tooltip;
74	}	75	}
75		76
76	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
77		78
78	if ($GRAB) {	79	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79	($x, $y) = $GRAB->coord2local ($x, $y);	80	if $GRAB;
80	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81	}
82	}	81	}
83		82
84	sub feed_sdl_button_up_event {	83	sub feed_sdl_button_up_event {
85	my ($ev) = @_;	84	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	85	my ($x, $y) = ($ev->{x}, $ev->{y});
87		86
88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89		88
90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91		90
92	if ($GRAB) {	91	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93	($x, $y) = $GRAB->coord2local ($x, $y);	92	if $GRAB;
94	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95	}
96		93
97	if (!$BUTTON_STATE) {	94	if (!$BUTTON_STATE) {
98	my $grab = $GRAB; undef $GRAB;	95	my $grab = $GRAB; undef $GRAB;
99	$grab->update if $grab;	96	$grab->update if $grab;
100	$GRAB->update if $GRAB;	97	$GRAB->update if $GRAB;
…		…
116	$HOVER->update if $HOVER && $HOVER->{can_hover};	113	$HOVER->update if $HOVER && $HOVER->{can_hover};
117		114
118	check_tooltip;	115	check_tooltip;
119	}	116	}
120		117
121	if ($HOVER) {
122	($x, $y) = $HOVER->coord2local ($x, $y);
123	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	118	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124	}	119	if $HOVER;
125	}	120	}
126		121
127	# convert position array to integers	122	# convert position array to integers
128	sub harmonize {	123	sub harmonize {
129	my ($vals) = @_;	124	my ($vals) = @_;
…		…
133	for (@$vals) {	128	for (@$vals) {
134	my $i = int $_ + $rem;	129	my $i = int $_ + $rem;
135	$rem += $_ - $i;	130	$rem += $_ - $i;
136	$_ = $i;	131	$_ = $i;
137	}	132	}
		133	}
		134
		135	sub full_refresh {
		136	# make a copy, otherwise for complains about freed values.
		137	my @widgets = values %WIDGET;
		138
		139	$_->update
		140	for @widgets;
		141	}
		142
		143	sub reconfigure_widgets {
		144	# make a copy, otherwise C<for> complains about freed values.
		145	my @widgets = values %WIDGET;
		146
		147	$_->reconfigure
		148	for @widgets;
		149	}
		150
		151	# call when resolution changes etc.
		152	sub rescale_widgets {
		153	my ($sx, $sy) = @_;
		154
		155	for my $widget (values %WIDGET) {
		156	if ($widget->{is_toplevel}) {
		157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		158	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		159	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		162	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		163	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		165	}
		166	}
		167
		168	reconfigure_widgets;
138	}	169	}
139		170
140	#############################################################################	171	#############################################################################
141		172
142	package CFClient::UI::Base;	173	package CFClient::UI::Base;
…		…
160	if (/^connect_(.*)$/) {	191	if (/^connect_(.*)$/) {
161	$self->connect ($1 => delete $self->{$_});	192	$self->connect ($1 => delete $self->{$_});
162	}	193	}
163	}	194	}
164		195
		196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		197
165	$self	198	$self
166	}	199	}
167		200
168	sub destroy {	201	sub destroy {
169	my ($self) = @_;	202	my ($self) = @_;
…		…
172	%$self = ();	205	%$self = ();
173	}	206	}
174		207
175	sub show {	208	sub show {
176	my ($self) = @_;	209	my ($self) = @_;
177
178	return if $self->{parent};	210	return if $self->{parent};
179		211
180	$CFClient::UI::ROOT->add ($self);	212	$CFClient::UI::ROOT->add ($self);
181	}	213	}
182		214
183	sub hide {	215	sub show_centered {
184	my ($self) = @_;	216	my ($self) = @_;
		217	return if $self->{parent};
		218
		219	$self->show;
		220
		221	$CFClient::UI::ROOT->on_post_alloc (
		222	"centered $self" => sub {
		223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		224	},
		225	);
		226	}
		227
		228	sub set_invisible {
		229	my ($self) = @_;
		230
		231	# broken show/hide model
		232
		233	delete $self->{visible};
185		234
186	undef $GRAB if $GRAB == $self;	235	undef $GRAB if $GRAB == $self;
187	undef $HOVER if $HOVER == $self;	236	undef $HOVER if $HOVER == $self;
		237
		238	CFClient::UI::check_tooltip
		239	if $CFClient::UI::TOOLTIP->{owner} == $self;
		240
		241	$self->focus_out;
		242	}
		243
		244	sub hide {
		245	my ($self) = @_;
		246
		247	$self->set_invisible;
188		248
189	$self->{parent}->remove ($self)	249	$self->{parent}->remove ($self)
190	if $self->{parent};	250	if $self->{parent};
191	}	251	}
192		252
…		…
242		302
243	sub size_allocate {	303	sub size_allocate {
244	# nothing to be done	304	# nothing to be done
245	}	305	}
246		306
247	sub children {
248	}
249
250	# call when resolution changes etc.
251	sub reconfigure {	307	sub reconfigure {
252	my ($self) = @_;	308	my ($self) = @_;
253
254	$_->reconfigure
255	for $self->children;
256		309
257	$self->check_size (1);	310	$self->check_size (1);
258	$self->update;	311	$self->update;
259	}	312	}
260		313
		314	sub children {
		315	}
		316
261	sub set_max_size {	317	sub set_max_size {
262	my ($self, $w, $h) = @_;	318	my ($self, $w, $h) = @_;
263		319
264	delete $self->{max_w}; $self->{max_w} = $w if $w;	320	delete $self->{max_w}; $self->{max_w} = $w if $w;
265	delete $self->{max_h}; $self->{max_h} = $h if $h;	321	delete $self->{max_h}; $self->{max_h} = $h if $h;
		322	}
		323
		324	sub set_tooltip {
		325	my ($self, $tooltip) = @_;
		326
		327	$tooltip =~ s/^\s+//;
		328	$tooltip =~ s/\s+$//;
		329
		330	return if $self->{tooltip} eq $tooltip;
		331
		332	$self->{tooltip} = $tooltip;
		333
		334	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		335	delete $CFClient::UI::TOOLTIP->{owner};
		336	CFClient::UI::check_tooltip;
		337	}
266	}	338	}
267		339
268	# translate global coordinates to local coordinate system	340	# translate global coordinates to local coordinate system
269	sub coord2local {	341	sub coord2local {
270	my ($self, $x, $y) = @_;	342	my ($self, $x, $y) = @_;
…		…
285	return if $FOCUS == $self;	357	return if $FOCUS == $self;
286	return unless $self->{can_focus};	358	return unless $self->{can_focus};
287		359
288	my $focus = $FOCUS; $FOCUS = $self;	360	my $focus = $FOCUS; $FOCUS = $self;
289		361
290	$self->emit (focus_in => $focus);	362	$self->_emit (focus_in => $focus);
291		363
292	$focus->update if $focus;	364	$focus->update if $focus;
293	$FOCUS->update;	365	$FOCUS->update;
294	}	366	}
295		367
…		…
298		370
299	return unless $FOCUS == $self;	371	return unless $FOCUS == $self;
300		372
301	my $focus = $FOCUS; undef $FOCUS;	373	my $focus = $FOCUS; undef $FOCUS;
302		374
303	$self->emit (focus_out => $focus);	375	$self->_emit (focus_out => $focus);
304		376
305	$focus->update if $focus; #?	377	$focus->update if $focus; #?
		378
		379	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		380	unless $FOCUS;
306	}	381	}
307		382
308	sub mouse_motion { }	383	sub mouse_motion { }
309	sub button_up { }	384	sub button_up { }
310	sub key_down { }	385	sub key_down { }
311	sub key_up { }	386	sub key_up { }
312		387
313	sub button_down {	388	sub button_down {
314	my ($self, $ev, $x, $y) = @_;	389	my ($self, $ev, $x, $y) = @_;
315		390
316	$self->focus_in;	391	$self->focus_in;
…		…
350	if ($ENV{PCLIENT_DEBUG}) {	425	if ($ENV{PCLIENT_DEBUG}) {
351	glPushMatrix;	426	glPushMatrix;
352	glColor 1, 1, 0, 1;	427	glColor 1, 1, 0, 1;
353	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354	glBegin GL_LINE_LOOP;	429	glBegin GL_LINE_LOOP;
355	glVertex 0 , 0;	430	glVertex 0 , 0;
356	glVertex $self->{w}, 0;	431	glVertex $self->{w} - 1, 0;
357	glVertex $self->{w}, $self->{h};	432	glVertex $self->{w} - 1, $self->{h} - 1;
358	glVertex 0 , $self->{h};	433	glVertex 0 , $self->{h} - 1;
359	glEnd;	434	glEnd;
360	glPopMatrix;	435	glPopMatrix;
361	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	436	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362	}	437	}
363	}	438	}
364		439
365	sub _draw {	440	sub _draw {
366	my ($self) = @_;	441	my ($self) = @_;
…		…
383	sub set_parent {	458	sub set_parent {
384	my ($self, $parent) = @_;	459	my ($self, $parent) = @_;
385		460
386	Scalar::Util::weaken ($self->{parent} = $parent);	461	Scalar::Util::weaken ($self->{parent} = $parent);
387		462
		463	$self->{root} = $parent->{root};
		464	$self->{visible} = $parent->{visible};
		465
388	# TODO: req_w _does_change after ->reconfigure	466	# TODO: req_w _does_change after ->reconfigure
389	$self->check_size	467	$self->check_size
390	unless exists $self->{req_w};	468	unless exists $self->{req_w};
		469
		470	$self->show;
391	}	471	}
392		472
393	sub check_size {	473	sub check_size {
394	my ($self, $forced) = @_;	474	my ($self, $forced) = @_;
395		475
…		…
408	my ($self, $signal, $cb) = @_;	488	my ($self, $signal, $cb) = @_;
409		489
410	push @{ $self->{signal_cb}{$signal} }, $cb;	490	push @{ $self->{signal_cb}{$signal} }, $cb;
411	}	491	}
412		492
		493	sub _emit {
		494	my ($self, $signal, @args) = @_;
		495
		496	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		497	}
		498
413	sub emit {	499	sub emit {
414	my ($self, $signal, @args) = @_;	500	my ($self, $signal, @args) = @_;
415		501
416	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	502	$self->_emit ($signal, @args)
		503	|| $self->$signal (@args);
417	}	504	}
418		505
419	sub DESTROY {	506	sub DESTROY {
420	my ($self) = @_;	507	my ($self) = @_;
421		508
		509	delete $WIDGET{$self+0};
422	#$self->deactivate;	510	#$self->deactivate;
423	}	511	}
424		512
425	#############################################################################	513	#############################################################################
426		514
…		…
435	my $class = shift;	523	my $class = shift;
436		524
437	# range [value, low, high, page]	525	# range [value, low, high, page]
438		526
439	$class->SUPER::new (	527	$class->SUPER::new (
440	bg => [0, 0, 0, 0.2],	528	#bg => [0, 0, 0, 0.2],
441	active_bg => [1, 1, 1, 0.5],	529	#active_bg => [1, 1, 1, 0.5],
442	@_	530	@_
443	)	531	)
444	}	532	}
445		533
446	sub _draw {	534	sub _draw {
447	my ($self) = @_;	535	my ($self) = @_;
448		536
		537	my $color = $FOCUS == $self && $self->{active_bg}
		538	? $self->{active_bg}
		539	: $self->{bg};
		540
		541	if ($color && (@$color < 4 || $color->[3])) {
449	my ($w, $h) = @$self{qw(w h)};	542	my ($w, $h) = @$self{qw(w h)};
450		543
451	glEnable GL_BLEND;	544	glEnable GL_BLEND;
452	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	545	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	546	glColor @$color;
454		547
455	glBegin GL_QUADS;	548	glBegin GL_QUADS;
456	glVertex 0 , 0;	549	glVertex 0 , 0;
457	glVertex 0 , $h;	550	glVertex 0 , $h;
458	glVertex $w, $h;	551	glVertex $w, $h;
459	glVertex $w, 0;	552	glVertex $w, 0;
460	glEnd;	553	glEnd;
461		554
462	glDisable GL_BLEND;	555	glDisable GL_BLEND;
		556	}
463	}	557	}
464		558
465	#############################################################################	559	#############################################################################
466		560
467	package CFClient::UI::Empty;	561	package CFClient::UI::Empty;
…		…
527	delete $child->{parent};	621	delete $child->{parent};
528	$child->hide;	622	$child->hide;
529		623
530	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	624	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531		625
532	$self->check_size;	626	$self->check_size (1);
533	$self->update;	627	$self->update;
534	}	628	}
535		629
536	sub clear {	630	sub clear {
537	my ($self) = @_;	631	my ($self) = @_;
…		…
651	$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 {
652	glClearColor 0, 0, 0, 0;	746	glClearColor 0, 0, 0, 0;
653	glClear GL_COLOR_BUFFER_BIT;	747	glClear GL_COLOR_BUFFER_BIT;
654		748
655	$self->_render;	749	$self->_render;
656	# glColorMask 1, 1, 1, 0;
657	# glEnable GL_BLEND;
658	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659	# glRasterPos 0, 0;
660	# glCopyPixels 0, 0, $self->{w}, $self->{h};
661	# glDisable GL_BLEND;
662	# glColorMask 1, 1, 1, 1;
663	};	750	};
664	}	751	}
665		752
666	sub _draw {	753	sub _draw {
667	my ($self) = @_;	754	my ($self) = @_;
…		…
671	my $tex = $self->{texture}	758	my $tex = $self->{texture}
672	or return;	759	or return;
673		760
674	glEnable GL_TEXTURE_2D;	761	glEnable GL_TEXTURE_2D;
675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	762	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676	glColor 0, 0, 0, 1;	763	glColor 1, 1, 1, 1;
677		764
678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	765	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679		766
680	glDisable GL_TEXTURE_2D;	767	glDisable GL_TEXTURE_2D;
681	}	768	}
…		…
684		771
685	package CFClient::UI::ViewPort;	772	package CFClient::UI::ViewPort;
686		773
687	our @ISA = CFClient::UI::Window::;	774	our @ISA = CFClient::UI::Window::;
688		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
689	sub size_request {	786	sub size_request {
690	my ($self) = @_;	787	my ($self) = @_;
691		788
692	@$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)};
693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
694		790
695	@$self{qw(child_w child_h)}	791	@$self{qw(child_w child_h)}
696	}	792	}
697		793
698	sub size_allocate {	794	sub size_allocate {
699	my ($self, $w, $h) = @_;	795	my ($self, $w, $h) = @_;
700		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);
701	$self->update;	801	$self->update;
702	}	802	}
703		803
704	sub set_offset {	804	sub set_offset {
705	my ($self, $x, $y) = @_;	805	my ($self, $x, $y) = @_;
…		…
759		859
760	my $slider = new CFClient::UI::Slider	860	my $slider = new CFClient::UI::Slider
761	vertical => 1,	861	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	862	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	863	connect_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	864	$self->{vp}->set_offset (0, $_[1]);
765	},	865	},
766	;	866	;
767		867
768	$self = $class->SUPER::new (	868	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	869	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	870	slider => $slider,
771	@_,	871	@_,
772	);	872	);
773		873
774	$self->{vp}->add ($self->{scrolled});	874	$self->{vp}->add ($self->{scrolled});
775	$self->add ($self->{vp});	875	$self->add ($self->{vp});
776	$self->add ($self->{slider});	876	$self->add ($self->{slider});
777		877
778	$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]);
779	}	898	}
780		899
781	#TODO# update range on size_allocate depending on child	900	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	901	# update viewport offset on scroll
783		902
…		…
837	my $class = shift;	956	my $class = shift;
838		957
839	# TODO: user_x, user_y, overwrite moveto?	958	# TODO: user_x, user_y, overwrite moveto?
840		959
841	my $self = $class->SUPER::new (	960	my $self = $class->SUPER::new (
842	bg => [1, 1, 1, 1],	961	bg => [1, 1, 1, 1],
843	border_bg => [1, 1, 1, 1],	962	border_bg => [1, 1, 1, 1],
844	border => 0.6,	963	border => 0.6,
		964	is_toplevel => 1,
845	can_events => 1,	965	can_events => 1,
846	@_	966	@_
847	);	967	);
848		968
849	$self->{title} &&= new CFClient::UI::Label	969	$self->{title} &&= new CFClient::UI::Label
850	align => 0,	970	align => 0,
…		…
874	my ($self, $w, $h) = @_;	994	my ($self, $w, $h) = @_;
875		995
876	$h -= List::Util::max 0, $self->border * 2;	996	$h -= List::Util::max 0, $self->border * 2;
877	$w -= List::Util::max 0, $self->border * 2;	997	$w -= List::Util::max 0, $self->border * 2;
878		998
879	$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)
880	if $self->{title};	1000	if $self->{title};
881		1001
882	$self->child->configure ($self->border, $self->border, $w, $h);	1002	$self->child->configure ($self->border, $self->border, $w, $h);
883	}	1003	}
884		1004
…		…
990	sub new {	1110	sub new {
991	my $class = shift;	1111	my $class = shift;
992		1112
993	$class->SUPER::new (	1113	$class->SUPER::new (
994	col_expand => [],	1114	col_expand => [],
995	@_	1115	@_,
996	)	1116	)
		1117	}
		1118
		1119	sub children {
		1120	grep $_, map @$_, grep $_, @{ $_[0]{children} }
997	}	1121	}
998		1122
999	sub add {	1123	sub add {
1000	my ($self, $x, $y, $child) = @_;	1124	my ($self, $x, $y, $child) = @_;
1001		1125
1002	$child->set_parent ($self);	1126	$child->set_parent ($self);
1003	$self->{children}[$y][$x] = $child;	1127	$self->{children}[$y][$x] = $child;
1004		1128
1005	$child->check_size;	1129	$self->check_size (1);
1006	}	1130	}
1007		1131
1008	sub children {
1009	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1010	}
1011
1012	# 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?
1013	sub clear {	1133	sub clear {
1014	my ($self) = @_;	1134	my ($self) = @_;
1015		1135
1016	my @children = $self->children;	1136	my @children = $self->children;
1017	delete $self->{children};	1137	delete $self->{children};
…		…
1019	for (@children) {	1139	for (@children) {
1020	delete $_->{parent};	1140	delete $_->{parent};
1021	$_->hide;	1141	$_->hide;
1022	}	1142	}
1023		1143
		1144	$self->check_size (1);
1024	$self->update;	1145	$self->update;
1025	}	1146	}
1026		1147
1027	sub get_wh {	1148	sub get_wh {
1028	my ($self) = @_;	1149	my ($self) = @_;
…		…
1060	sub size_allocate {	1181	sub size_allocate {
1061	my ($self, $w, $h) = @_;	1182	my ($self, $w, $h) = @_;
1062		1183
1063	my ($ws, $hs) = $self->get_wh;	1184	my ($ws, $hs) = $self->get_wh;
1064		1185
1065	my $req_w = sum @$ws;	1186	my $req_w = (sum @$ws) || 1;
1066	my $req_h = sum @$hs;	1187	my $req_h = (sum @$hs) || 1;
1067		1188
1068	# TODO: nicer code && do row_expand	1189	# TODO: nicer code && do row_expand
1069	my @col_expand = @{$self->{col_expand}};	1190	my @col_expand = @{$self->{col_expand}};
1070	@col_expand = (1) x @$ws unless @col_expand;	1191	@col_expand = (1) x @$ws unless @col_expand;
1071	my $col_expand = (sum @col_expand) || 1;	1192	my $col_expand = (sum @col_expand) || 1;
…		…
1245		1366
1246	#############################################################################	1367	#############################################################################
1247		1368
1248	package CFClient::UI::Label;	1369	package CFClient::UI::Label;
1249		1370
1250	our @ISA = CFClient::UI::Base::;	1371	our @ISA = CFClient::UI::DrawBG::;
1251		1372
1252	use CFClient::OpenGL;	1373	use CFClient::OpenGL;
1253		1374
1254	sub new {	1375	sub new {
1255	my ($class, %arg) = @_;	1376	my ($class, %arg) = @_;
1256		1377
1257	my $self = $class->SUPER::new (	1378	my $self = $class->SUPER::new (
1258	fg => [1, 1, 1],	1379	fg => [1, 1, 1],
		1380	#bg => none
		1381	#active_bg => none
1259	#font => default_font	1382	#font => default_font
1260	#text => initial text	1383	#text => initial text
1261	#markup => initial narkup	1384	#markup => initial narkup
		1385	#max_w => maximum pixel width
		1386	ellipsise => 3, # end
1262	layout => (new CFClient::Layout),	1387	layout => (new CFClient::Layout),
1263	fontsize => 1,	1388	fontsize => 1,
1264	align => -1,	1389	align => -1,
1265	valign => -1,	1390	valign => -1,
1266	padding => 2,	1391	padding => 2,
…		…
1281	}	1406	}
1282		1407
1283	$self	1408	$self
1284	}	1409	}
1285		1410
1286	sub escape {	1411	sub escape($) {
1287	local $_ = $_[1];	1412	local $_ = $_[0];
1288		1413
1289	s/&/&amp;/g;	1414	s/&/&amp;/g;
1290	s/>/&gt;/g;	1415	s/>/&gt;/g;
1291	s/</&lt;/g;	1416	s/</&lt;/g;
1292		1417
1293	$_[1]	1418	$_
1294	}	1419	}
1295		1420
1296	sub update {	1421	sub update {
1297	my ($self) = @_;	1422	my ($self) = @_;
1298		1423
…		…
1331	sub size_request {	1456	sub size_request {
1332	my ($self) = @_;	1457	my ($self) = @_;
1333		1458
1334	$self->{layout}->set_font ($self->{font}) if $self->{font};	1459	$self->{layout}->set_font ($self->{font}) if $self->{font};
1335	$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});
1336	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1463	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337		1464
1338	my ($w, $h) = $self->{layout}->size;	1465	my ($w, $h) = $self->{layout}->size;
1339		1466
1340	if (exists $self->{template}) {	1467	if (exists $self->{template}) {
…		…
1370	}	1497	}
1371		1498
1372	sub _draw {	1499	sub _draw {
1373	my ($self) = @_;	1500	my ($self) = @_;
1374		1501
		1502	$self->SUPER::_draw; # draw background, if applicable
		1503
1375	my $tex = $self->{texture} ||= do {	1504	my $tex = $self->{texture} ||= do {
1376	$self->{layout}->set_foreground (@{$self->{fg}});	1505	$self->{layout}->set_foreground (@{$self->{fg}});
1377	$self->{layout}->set_font ($self->{font}) if $self->{font};	1506	$self->{layout}->set_font ($self->{font}) if $self->{font};
1378	$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});
1379	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1510	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380		1511
1381	my $tex = new_from_layout CFClient::Texture $self->{layout};	1512	my $tex = new_from_layout CFClient::Texture $self->{layout};
1382		1513
1383	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1514	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1384	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1515	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385	: ($self->{w} - $tex->{w}) * 0.5;	1516	: ($self->{w} - $tex->{w}) * 0.5);
1386		1517
1387	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1518	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1388	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1519	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389	: ($self->{h} - $tex->{h}) * 0.5;	1520	: ($self->{h} - $tex->{h}) * 0.5);
1390		1521
1391	$tex	1522	$tex
1392	};	1523	};
1393		1524
1394	glEnable GL_TEXTURE_2D;	1525	glEnable GL_TEXTURE_2D;
…		…
1422	active_fg => [0, 0, 0],	1553	active_fg => [0, 0, 0],
1423	can_hover => 1,	1554	can_hover => 1,
1424	can_focus => 1,	1555	can_focus => 1,
1425	valign => 0,	1556	valign => 0,
1426	can_events => 1,	1557	can_events => 1,
		1558	#text => ...
1427	@_	1559	@_
1428	)	1560	)
1429	}	1561	}
1430		1562
1431	sub _set_text {	1563	sub _set_text {
…		…
1441	$self->{text} = $text;	1573	$self->{text} = $text;
1442		1574
1443	$text =~ s/./*/g if $self->{hidden};	1575	$text =~ s/./*/g if $self->{hidden};
1444	$self->{layout}->set_text ("$text ");	1576	$self->{layout}->set_text ("$text ");
1445		1577
1446	$self->emit (changed => $self->{text});	1578	$self->_emit (changed => $self->{text});
1447	}	1579	}
1448		1580
1449	sub set_text {	1581	sub set_text {
1450	my ($self, $text) = @_;	1582	my ($self, $text) = @_;
1451		1583
1452	$self->{cursor} = length $text;	1584	$self->{cursor} = length $text;
1453	$self->_set_text ($text);	1585	$self->_set_text ($text);
		1586	$self->update;
1454	$self->check_size;	1587	$self->check_size;
1455	$self->update;
1456	}	1588	}
1457		1589
1458	sub get_text {	1590	sub get_text {
1459	$_[0]{text}	1591	$_[0]{text}
1460	}	1592	}
…		…
1463	my ($self) = @_;	1595	my ($self) = @_;
1464		1596
1465	my ($w, $h) = $self->SUPER::size_request;	1597	my ($w, $h) = $self->SUPER::size_request;
1466		1598
1467	($w + 1, $h) # add 1 for cursor	1599	($w + 1, $h) # add 1 for cursor
1468	}
1469
1470	sub size_allocate {
1471	my ($self, $w, $h) = @_;
1472
1473	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1474	}	1600	}
1475		1601
1476	sub key_down {	1602	sub key_down {
1477	my ($self, $ev) = @_;	1603	my ($self, $ev) = @_;
1478		1604
…		…
1493	} elsif ($sym == CFClient::SDLK_HOME) {	1619	} elsif ($sym == CFClient::SDLK_HOME) {
1494	$self->{cursor} = 0;	1620	$self->{cursor} = 0;
1495	} elsif ($sym == CFClient::SDLK_END) {	1621	} elsif ($sym == CFClient::SDLK_END) {
1496	$self->{cursor} = length $text;	1622	$self->{cursor} = length $text;
1497	} elsif ($uni == 27) {	1623	} elsif ($uni == 27) {
1498	$self->emit ('escape');	1624	$self->_emit ('escape');
1499	} elsif ($uni) {	1625	} elsif ($uni) {
1500	substr $text, $self->{cursor}++, 0, chr $uni;	1626	substr $text, $self->{cursor}++, 0, chr $uni;
1501	}	1627	}
1502		1628
1503	$self->_set_text ($text);	1629	$self->_set_text ($text);
1504	$self->update;	1630	$self->update;
		1631	$self->check_size;
1505	}	1632	}
1506		1633
1507	sub focus_in {	1634	sub focus_in {
1508	my ($self) = @_;	1635	my ($self) = @_;
1509		1636
…		…
1589	if ($sym == 13) {	1716	if ($sym == 13) {
1590	unshift @{$self->{history}},	1717	unshift @{$self->{history}},
1591	my $txt = $self->get_text;	1718	my $txt = $self->get_text;
1592	$self->{history_pointer} = -1;	1719	$self->{history_pointer} = -1;
1593	$self->{history_saveback} = '';	1720	$self->{history_saveback} = '';
1594	$self->emit (activate => $txt);	1721	$self->_emit (activate => $txt);
1595	$self->update;	1722	$self->update;
1596		1723
1597	} elsif ($sym == CFClient::SDLK_UP) {	1724	} elsif ($sym == CFClient::SDLK_UP) {
1598	if ($self->{history_pointer} < 0) {	1725	if ($self->{history_pointer} < 0) {
1599	$self->{history_saveback} = $self->get_text;	1726	$self->{history_saveback} = $self->get_text;
…		…
1638	my $class = shift;	1765	my $class = shift;
1639		1766
1640	$class->SUPER::new (	1767	$class->SUPER::new (
1641	padding => 4,	1768	padding => 4,
1642	fg => [1, 1, 1],	1769	fg => [1, 1, 1],
1643	bg => [1, 1, 1, 0.2],
1644	active_fg => [0, 0, 1],	1770	active_fg => [0, 0, 1],
1645	can_hover => 1,	1771	can_hover => 1,
1646	align => 0,	1772	align => 0,
1647	valign => 0,	1773	valign => 0,
1648	can_events => 1,	1774	can_events => 1,
1649	@_	1775	@_
1650	)	1776	)
1651	}	1777	}
1652		1778
		1779	sub activate { }
		1780
1653	sub button_up {	1781	sub button_up {
1654	my ($self, $ev, $x, $y) = @_;	1782	my ($self, $ev, $x, $y) = @_;
1655		1783
		1784	$self->emit ("activate")
1656	if ($x >= 0 && $x < $self->{w}	1785	if $x >= 0 && $x < $self->{w}
1657	&& $y >= 0 && $y < $self->{h}) {	1786	&& $y >= 0 && $y < $self->{h};
1658	$self->emit ("activate");
1659	}
1660	}	1787	}
1661		1788
1662	sub _draw {	1789	sub _draw {
1663	my ($self) = @_;	1790	my ($self) = @_;
1664		1791
…		…
1696		1823
1697	$class->SUPER::new (	1824	$class->SUPER::new (
1698	padding => 2,	1825	padding => 2,
1699	fg => [1, 1, 1],	1826	fg => [1, 1, 1],
1700	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],
1701	state => 0,	1830	state => 0,
1702	can_hover => 1,	1831	can_hover => 1,
1703	@_	1832	@_
1704	)	1833	)
1705	}	1834	}
…		…
1714	my ($self, $ev, $x, $y) = @_;	1843	my ($self, $ev, $x, $y) = @_;
1715		1844
1716	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1845	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1717	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1846	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1718	$self->{state} = !$self->{state};	1847	$self->{state} = !$self->{state};
1719	$self->emit (changed => $self->{state});	1848	$self->_emit (changed => $self->{state});
1720	}	1849	}
1721	}	1850	}
1722		1851
1723	sub _draw {	1852	sub _draw {
1724	my ($self) = @_;	1853	my ($self) = @_;
…		…
1989	qw(s1_slider.png s1_slider_bg.png);	2118	qw(s1_slider.png s1_slider_bg.png);
1990		2119
1991	sub new {	2120	sub new {
1992	my $class = shift;	2121	my $class = shift;
1993		2122
1994	# range [value, low, high, page]	2123	# range [value, low, high, page, unit]
1995		2124
1996	# TODO: 0-width page	2125	# TODO: 0-width page
1997	# TODO: req_w/h are wrong with vertical	2126	# TODO: req_w/h are wrong with vertical
1998	# TODO: calculations are off	2127	# TODO: calculations are off
1999	my $self = $class->SUPER::new (	2128	my $self = $class->SUPER::new (
2000	fg => [1, 1, 1],	2129	fg => [1, 1, 1],
2001	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],
2002	range => [0, 0, 100, 10],	2133	range => [0, 0, 100, 10, 0],
2003	req_w => $::WIDTH / 80,	2134	req_w => $::WIDTH / 80,
2004	req_h => $::WIDTH / 80,	2135	req_h => $::WIDTH / 80,
2005	vertical => 0,	2136	vertical => 0,
2006	can_hover => 1,	2137	can_hover => 1,
2007	inner_pad => 5,	2138	inner_pad => 0.02,
2008	@_	2139	@_
2009	);	2140	);
2010		2141
		2142	$self->set_value ($self->{range}[0]);
		2143	$self->update;
		2144
2011	$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	}
2012	}	2178	}
2013		2179
2014	sub size_request {	2180	sub size_request {
2015	my ($self) = @_;	2181	my ($self) = @_;
2016		2182
…		…
2022		2188
2023	sub button_down {	2189	sub button_down {
2024	my ($self, $ev, $x, $y) = @_;	2190	my ($self, $ev, $x, $y) = @_;
2025		2191
2026	$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
2027	$self->mouse_motion ($ev, $x, $y);	2196	$self->mouse_motion ($ev, $x, $y);
2028	}	2197	}
2029		2198
2030	sub mouse_motion {	2199	sub mouse_motion {
2031	my ($self, $ev, $x, $y) = @_;	2200	my ($self, $ev, $x, $y) = @_;
2032		2201
2033	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
2034	my ($value, $lo, $hi, $page) = @{$self->{range}};	2219	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2220	my $range = ($hi - $page - $lo) || 1e-100;
2035		2221
2036	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2222	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2037		2223
2038	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2224	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2039	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2225	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2040		2226
2041	$x -= $inner_pad_px; # substract the padding	2227	$value = ($value - $lo) / $range;
2042	$x = $x * ($hi - $lo) / $inner_w + $lo;	2228	$value = $value * $self->{scale} + $self->{offset};
2043	$x = $lo if $x < $lo;
2044	$x = $hi - $page if $x > $hi - $page;
2045	$self->{range}[0] = $x;
2046		2229
2047	$self->emit (changed => $x);	2230	$self->{knob_x} = $value - $knob_w * 0.5;
2048	$self->update;	2231	$self->{knob_w} = $knob_w;
2049	}	2232	});
2050	}
2051		2233
2052	# the inner_* stuff is for generating a padding for the slider handle,	2234	$self->SUPER::update;
2053	# so that the handle doesn't leave the texture. This calculation isn't 100%
2054	# correct propably, but it does the job for now
2055	sub _calc_inner_pad_px {
2056	my ($self, $w) = @_;
2057	($w / 100) * $self->{inner_pad} # % to pixels
2058	}	2235	}
2059		2236
2060	sub _draw {	2237	sub _draw {
2061	my ($self) = @_;	2238	my ($self) = @_;
2062		2239
2063	$self->SUPER::_draw ();	2240	$self->SUPER::_draw ();
2064		2241
2065	my ($w, $h) = @$self{qw(w h)};	2242	glScale $self->{w}, $self->{h};
2066		2243
2067	if ($self->{vertical}) {	2244	if ($self->{vertical}) {
2068	# draw a vertical slider like a rotated horizontal slider	2245	# draw a vertical slider like a rotated horizontal slider
2069		2246
		2247	glTranslate 1, 0, 0;
2070	glRotate 90, 0, 0, 1;	2248	glRotate 90, 0, 0, 1;
2071	glTranslate 0, -$self->{w}, 0;
2072
2073	($w, $h) = ($h, $w);
2074	}	2249	}
2075		2250
2076	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2251	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2252	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078		2253
2079	my ($value, $lo, $hi, $page) = @{$self->{range}};
2080
2081	$hi = $value + 1 if $lo == $hi;
2082
2083	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2084	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2085
2086	$page = int $page * $inner_w / ($hi - $lo);
2087	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2088
2089	$w -= $page;
2090	$page &= ~1;
2091	glTranslate $page * 0.5, 0, 0;
2092	$page ||= 2;
2093
2094	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2095	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2096
2097	glEnable GL_TEXTURE_2D;	2254	glEnable GL_TEXTURE_2D;
2098	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2255	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099		2256
2100	# draw background	2257	# draw background
2101	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2258	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102		2259
2103	# draw handle	2260	# draw handle
2104	$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);
2105		2262
2106	glDisable GL_TEXTURE_2D;	2263	glDisable GL_TEXTURE_2D;
2107	}	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 (@_) }
2108		2306
2109	#############################################################################	2307	#############################################################################
2110		2308
2111	package CFClient::UI::TextView;	2309	package CFClient::UI::TextView;
2112		2310
…		…
2142		2340
2143	$self->{fontsize} = $fontsize;	2341	$self->{fontsize} = $fontsize;
2144	$self->reflow;	2342	$self->reflow;
2145	}	2343	}
2146		2344
2147	sub text_height {
2148	my ($self, $text) = @_;
2149
2150	my $layout = $self->{layout};
2151
2152	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2153	$layout->set_width ($self->{children}[0]{w});
2154	$layout->set_markup ($text);
2155
2156	($layout->size)[1]
2157	}
2158
2159	sub reflow {
2160	my ($self) = @_;
2161
2162	$self->{need_reflow}++;
2163	$self->update;
2164	}
2165
2166	sub size_allocate {	2345	sub size_allocate {
2167	my ($self, $w, $h) = @_;	2346	my ($self, $w, $h) = @_;
2168		2347
2169	$self->SUPER::size_allocate ($w, $h);	2348	$self->SUPER::size_allocate ($w, $h);
2170		2349
…		…
2173	$self->{layout}->set_width ($self->{children}[0]{w});	2352	$self->{layout}->set_width ($self->{children}[0]{w});
2174		2353
2175	$self->reflow;	2354	$self->reflow;
2176	}	2355	}
2177		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
2178	sub add_paragraph {	2391	sub add_paragraph {
2179	my ($self, $color, $text) = @_;	2392	my ($self, $color, $text, $indent) = @_;
2180		2393
2181	#TODO: intelligently "reformat" paragraph	2394	for my $line (split /\n/, $text) {
2182		2395	my ($w, $h) = $self->text_size ($line);
2183	my $height = $self->text_height ($text);
2184
2185	$self->{height} += $height;	2396	$self->{height} += $h;
		2397	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2398	}
2186		2399
2187	push @{$self->{par}}, [$height, $color, $text];
2188
2189	$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]);
2190	$self->{children}[1]->update;
2191	}	2401	}
2192		2402
2193	sub update {	2403	sub update {
2194	my ($self) = @_;	2404	my ($self) = @_;
2195		2405
…		…
2198	return unless $self->{h} > 0;	2408	return unless $self->{h} > 0;
2199		2409
2200	delete $self->{texture};	2410	delete $self->{texture};
2201		2411
2202	$ROOT->on_post_alloc ($self, sub {	2412	$ROOT->on_post_alloc ($self, sub {
		2413	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2414
2203	if (delete $self->{need_reflow}) {	2415	if (delete $self->{need_reflow}) {
2204	my $height = 0;	2416	my $height = 0;
2205		2417
2206	$height += $_->[0] = $self->text_height ($_->[2])	2418	my $layout = $self->{layout};
		2419
		2420	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2421
2207	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	}
2208		2433
2209	$self->{height} = $height;	2434	$self->{height} = $height;
2210		2435
2211	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2436	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2212		2437
2213	delete $self->{texture};	2438	delete $self->{texture};
2214	}	2439	}
2215		2440
2216	$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 {
2217	glClearColor 0, 0, 0, 0;	2442	glClearColor 0.5, 0.5, 0.5, 0;
2218	glClear GL_COLOR_BUFFER_BIT;	2443	glClear GL_COLOR_BUFFER_BIT;
2219		2444
2220	glEnable GL_TEXTURE_2D;
2221	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222
2223	my $top = int $self->{children}[1]{range}[0];	2445	my $top = int $self->{children}[1]{range}[0];
2224		2446
2225	my $y0 = $top;	2447	my $y0 = $top;
2226	my $y1 = $top + $self->{h};	2448	my $y1 = $top + $H;
2227		2449
2228	my $y = 0;	2450	my $y = 0;
2229		2451
2230	my $layout = $self->{layout};	2452	my $layout = $self->{layout};
2231		2453
2232	$layout->set_font ($self->{font}) if $self->{font};	2454	$layout->set_font ($self->{font}) if $self->{font};
2233		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
2234	for my $par (@{$self->{par}}) {	2460	for my $par (@{$self->{par}}) {
2235	my $h = $par->[0];	2461	my $h = $par->[1];
2236		2462
2237	if ($y0 < $y + $h && $y < $y1) {	2463	if ($y0 < $y + $h && $y < $y1) {
2238	$layout->set_foreground (@{ $par->[1] });	2464	$layout->set_foreground (@{ $par->[2] });
		2465	$layout->set_width ($W - $par->[3]);
2239	$layout->set_markup ($par->[2]);	2466	$layout->set_markup ($par->[4]);
2240		2467
2241	my ($W, $H) = $layout->size;	2468	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2242	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;
2243	}	2472	}
2244		2473
2245	$y += $h;	2474	$y += $h;
2246	}	2475	}
2247		2476
2248	glDisable GL_TEXTURE_2D;	2477	glDisable GL_BLEND;
2249	};	2478	};
2250	});	2479	});
2251	}	2480	}
2252		2481
2253	sub _draw {	2482	sub _draw {
2254	my ($self) = @_;	2483	my ($self) = @_;
2255		2484
2256	glEnable GL_TEXTURE_2D;	2485	glEnable GL_TEXTURE_2D;
2257	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2486	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258	glColor 1, 1, 1, 1;	2487	glColor 1, 1, 1, 1;
2259	$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});
2260	glDisable GL_TEXTURE_2D;	2489	glDisable GL_TEXTURE_2D;
2261		2490
2262	$self->{children}[1]->draw;	2491	$self->{children}[1]->draw;
2263		2492
2264	}	2493	}
…		…
2333		2562
2334	# TODO: use animation	2563	# TODO: use animation
2335	if ($self->{state} = !$self->{state}) {	2564	if ($self->{state} = !$self->{state}) {
2336	$CFClient::UI::ROOT->add ($self->{other});	2565	$CFClient::UI::ROOT->add ($self->{other});
2337	$self->{other}->move ($self->coord2global (0, $self->{h}));	2566	$self->{other}->move ($self->coord2global (0, $self->{h}));
2338	$self->emit ("open");	2567	$self->_emit ("open");
2339	} else {	2568	} else {
2340	$CFClient::UI::ROOT->remove ($self->{other});	2569	$CFClient::UI::ROOT->remove ($self->{other});
2341	$self->emit ("close");	2570	$self->_emit ("close");
2342	}	2571	}
2343		2572
2344	$self->emit (changed => $self->{state});	2573	$self->_emit (changed => $self->{state});
2345	}	2574	}
2346		2575
2347	#############################################################################	2576	#############################################################################
2348		2577
2349	package CFClient::UI::Tooltip;	2578	package CFClient::UI::Tooltip;
…		…
2363		2592
2364	sub set_tooltip_from {	2593	sub set_tooltip_from {
2365	my ($self, $widget) = @_;	2594	my ($self, $widget) = @_;
2366		2595
2367	$self->add (new CFClient::UI::Label	2596	$self->add (new CFClient::UI::Label
2368	markup => $widget->{tooltip},	2597	markup => $widget->{tooltip},
2369	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2598	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370	fontsize => 0.8,	2599	fontsize => 0.8,
2371	fg => [0, 0, 0, 1],	2600	fg => [0, 0, 0, 1],
		2601	ellipsise => 0,
2372	font => ($widget->{tooltip_font} || $::FONT_PROP),	2602	font => ($widget->{tooltip_font} || $::FONT_PROP),
2373	);	2603	);
2374	}	2604	}
2375		2605
2376	sub size_request {	2606	sub size_request {
2377	my ($self) = @_;	2607	my ($self) = @_;
…		…
2423	use CFClient::OpenGL;	2653	use CFClient::OpenGL;
2424		2654
2425	sub new {	2655	sub new {
2426	my $class = shift;	2656	my $class = shift;
2427		2657
2428	$class->SUPER::new (	2658	my $self = $class->SUPER::new (
2429	aspect => 1,	2659	aspect => 1,
		2660	can_events => 0,
2430	@_,	2661	@_,
2431	)	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
2432	}	2679	}
2433		2680
2434	sub size_request {	2681	sub size_request {
2435	(32, 8)	2682	(32, 8)
2436	}	2683	}
2437		2684
		2685	sub update {
		2686	my ($self) = @_;
		2687
		2688	return unless $self->{visible};
		2689
		2690	$self->SUPER::update;
		2691	}
		2692
2438	sub _draw {	2693	sub _draw {
2439	my ($self) = @_;	2694	my ($self) = @_;
2440		2695
2441	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
2442	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2707	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2443		2708
2444	# TODO animation
2445	if ($tex) {	2709	if ($tex) {
2446	glEnable GL_TEXTURE_2D;	2710	glEnable GL_TEXTURE_2D;
2447	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2711	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448	glColor 1, 1, 1, 1;	2712	glColor 1, 1, 1, 1;
2449	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2713	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450	glDisable GL_TEXTURE_2D;	2714	glDisable GL_TEXTURE_2D;
2451	}	2715	}
2452	}	2716	}
2453		2717
		2718	sub DESTROY {
		2719	my ($self) = @_;
		2720
		2721	$self->{timer}->cancel
		2722	if $self->{timer};
		2723
		2724	$self->SUPER::DESTROY;
		2725	}
		2726
2454	#############################################################################	2727	#############################################################################
2455		2728
2456	package CFClient::UI::InventoryItem;	2729	package CFClient::UI::Inventory;
2457		2730
2458	our @ISA = CFClient::UI::HBox::;	2731	our @ISA = CFClient::UI::ScrolledWindow::;
2459		2732
2460	sub new {	2733	sub new {
2461	my $class = shift;	2734	my $class = shift;
2462		2735
2463	my %args = @_;
2464
2465	my $item = delete $args{item};
2466
2467	my $desc = $item->{nrof} < 2
2468	? $item->{name}
2469	: "$item->{nrof} $item->{name_pl}";
2470
2471
2472	my $self = $class->SUPER::new (	2736	my $self = $class->SUPER::new (
2473	can_hover => 1,	2737	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2474	can_events => 1,
2475	tooltip => (CFClient::UI::Label->escape ($desc)
2476	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477	connect_button_down => sub {
2478	my ($self, $ev, $x, $y) = @_;
2479
2480	# todo: maybe put examine on 1? but should just be a tooltip :(
2481	if ($ev->{button} == 1) {
2482	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483	} elsif ($ev->{button} == 2) {
2484	$::CONN->send ("apply $item->{tag}");
2485	} elsif ($ev->{button} == 3) {
2486	CFClient::UI::Menu->new (
2487	items => [
2488	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489	[
2490	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491	sub { $::CONN->send ("lock $item->{tag}") },
2492	],
2493	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496	],
2497	)->popup ($ev);
2498	}
2499
2500	1
2501	},
2502	%args
2503	);
2504
2505	$self->add (new CFClient::UI::Face
2506	can_events => 0,
2507	face => $item->{face},
2508	anim => $item->{anim},
2509	animspeed => $item->{animspeed},
2510	);
2511
2512	$self->add (new CFClient::UI::Label
2513	can_events => 0,
2514	text => $desc,
2515	);
2516
2517	$self
2518	}
2519
2520	#############################################################################
2521
2522	package CFClient::UI::Inventory;
2523
2524	our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526	sub new {
2527	my $class = shift;
2528
2529	my $self = $class->SUPER::new (
2530	scrolled => (new CFClient::UI::VBox),
2531	@_,	2738	@_,
2532	);	2739	);
2533		2740
2534	$self	2741	$self
2535	}	2742	}
…		…
2545	or ($a->{name} cmp $b->{name})	2752	or ($a->{name} cmp $b->{name})
2546	} @$items;	2753	} @$items;
2547		2754
2548	$self->{real_items} = \@items;	2755	$self->{real_items} = \@items;
2549		2756
		2757	my $row = 0;
2550	for my $item (@items) {	2758	for my $item (@items) {
2551	my $desc = $item->{nrof} < 2	2759	CFClient::Item::update_widgets $item;
2552	? $item->{name}
2553	: "$item->{nrof} $item->{name_pl}";
2554		2760
2555	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2761	$self->{scrolled}->add (0, $row, $item->{face_widget});
2556	}	2762	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2763	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2557		2764
2558	$self->{scrolled}->add (@items);	2765	$row++;
2559		2766	}
2560	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2561	}	2767	}
2562		2768
2563	sub size_request {	2769	sub size_request {
2564	my ($self) = @_;	2770	my ($self) = @_;
2565	($self->{req_w}, $self->{req_h});	2771	($self->{req_w}, $self->{req_h});
…		…
2605		2811
2606	# 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)
2607	sub popup {	2813	sub popup {
2608	my ($self, $ev) = @_;	2814	my ($self, $ev) = @_;
2609		2815
2610	$self->emit ("popdown");	2816	$self->_emit ("popdown");
2611		2817
2612	# maybe save $GRAB? must be careful about events...	2818	# maybe save $GRAB? must be careful about events...
2613	$GRAB = $self;	2819	$GRAB = $self;
2614	$self->{button} = $ev->{button};	2820	$self->{button} = $ev->{button};
2615		2821
…		…
2630		2836
2631	if ($ev->{button} == $self->{button}) {	2837	if ($ev->{button} == $self->{button}) {
2632	undef $GRAB;	2838	undef $GRAB;
2633	$self->hide;	2839	$self->hide;
2634		2840
2635	$self->emit ("popdown");	2841	$self->_emit ("popdown");
2636	$self->{hover}[1]->() if $self->{hover};	2842	$self->{hover}[1]->() if $self->{hover};
2637	}	2843	}
2638	}	2844	}
2639		2845
2640	#############################################################################	2846	#############################################################################
2641		2847
2642	package CFClient::UI::Statusbox;	2848	package CFClient::UI::Statusbox;
2643		2849
2644	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	}
2645		2860
2646	sub reorder {	2861	sub reorder {
2647	my ($self) = @_;	2862	my ($self) = @_;
2648	my $NOW = time;	2863	my $NOW = time;
2649		2864
…		…
2668	? "<b>$item->{count} ×</b> $item->{text}"	2883	? "<b>$item->{count} ×</b> $item->{text}"
2669	: $item->{text};	2884	: $item->{text};
2670		2885
2671	for ($short) {	2886	for ($short) {
2672	s/^\s+//;	2887	s/^\s+//;
2673	s/\012.*/…/s;	2888	s/\s+/ /g;
2674	my $len = int 40 / $item->{fontsize};
2675	substr $_, $len, length, "…" if $len < length;
2676	}	2889	}
2677		2890
2678	new CFClient::UI::Label	2891	new CFClient::UI::Label
2679	markup => $short,	2892	markup => $short,
2680	tooltip => $item->{tooltip},	2893	tooltip => $item->{tooltip},
2681	tooltip_font => $::FONT_PROP,	2894	tooltip_font => $::FONT_PROP,
2682	tooltip_width => 0.67,	2895	tooltip_width => 0.67,
2683	fontsize => $item->{fontsize},	2896	fontsize => $item->{fontsize} || $self->{fontsize},
		2897	max_w => $::WIDTH * 0.44,
2684	color => $item->{color},	2898	fg => $item->{fg},
2685	can_events => 1,	2899	can_events => 1,
2686	can_hover => 1	2900	can_hover => 1
2687	};	2901	};
2688	}	2902	}
2689		2903
…		…
2694	sub add {	2908	sub add {
2695	my ($self, $text, %arg) = @_;	2909	my ($self, $text, %arg) = @_;
2696		2910
2697	$text =~ s/^\s+//;	2911	$text =~ s/^\s+//;
2698	$text =~ s/\s+$//;	2912	$text =~ s/\s+$//;
		2913
		2914	return unless $text;
2699		2915
2700	my $timeout = time + ((delete $arg{timeout}) || 60);	2916	my $timeout = time + ((delete $arg{timeout}) || 60);
2701		2917
2702	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2918	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2703		2919
…		…
2715	$self->{item}{$group} = {	2931	$self->{item}{$group} = {
2716	id => ++$self->{id},	2932	id => ++$self->{id},
2717	text => $text,	2933	text => $text,
2718	timeout => $timeout,	2934	timeout => $timeout,
2719	tooltip => $text,	2935	tooltip => $text,
2720	fontsize => 0.8,
2721	color => [0.8, 0.8, 0.8, 0.8],	2936	fg => [0.8, 0.8, 0.8, 0.8],
2722	pri => 0,	2937	pri => 0,
2723	count => 1,	2938	count => 1,
2724	%arg,	2939	%arg,
2725	};	2940	};
2726	}	2941	}
2727		2942
2728	$self->reorder;	2943	$self->reorder;
2729	}	2944	}
2730		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
2731	#############################################################################	2956	#############################################################################
2732		2957
2733	package CFClient::UI::Root;	2958	package CFClient::UI::Root;
2734		2959
2735	our @ISA = CFClient::UI::Container::;	2960	our @ISA = CFClient::UI::Container::;
…		…
2765	}	2990	}
2766		2991
2767	sub size_allocate {	2992	sub size_allocate {
2768	my ($self, $w, $h) = @_;	2993	my ($self, $w, $h) = @_;
2769		2994
2770	my $old_w = $self->{old_w};
2771	my $old_h = $self->{old_h};
2772
2773	if ($old_w && $old_h) {
2774	for my $child ($self->children) {
2775	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2776	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2777	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2778	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2779	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2780	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2781	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2782	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2783	}
2784	}
2785
2786	for my $child ($self->children) {	2995	for my $child ($self->children) {
2787	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)};
2788		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
2789	$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;
2790	$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
2791	$child->configure ($X, $Y, $W, $H);	3007	$child->configure ($X, $Y, $W, $H);
2792	}	3008	}
2793
2794	$self->{old_w} = $w;
2795	$self->{old_h} = $h;
2796	}	3009	}
2797		3010
2798	sub coord2local {	3011	sub coord2local {
2799	my ($self, $x, $y) = @_;	3012	my ($self, $x, $y) = @_;
2800		3013
…		…
2813	$self->check_size;	3026	$self->check_size;
2814	$::WANT_REFRESH++;	3027	$::WANT_REFRESH++;
2815	}	3028	}
2816		3029
2817	sub add {	3030	sub add {
2818	my ($self, $child) = @_;	3031	my ($self, @children) = @_;
2819		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
2820	# integerise window positions	3042	# integerise window positions
2821	$child->{x} = int $child->{x};	3043	$child->{x} = int $child->{x};
2822	$child->{y} = int $child->{y};	3044	$child->{y} = int $child->{y};
		3045	}
2823		3046
2824	$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	}
2825	}	3060	}
2826		3061
2827	sub on_refresh {	3062	sub on_refresh {
2828	my ($self, $id, $cb) = @_;	3063	my ($self, $id, $cb) = @_;
2829		3064
…		…
2882	$w = 0 if $w < 0;	3117	$w = 0 if $w < 0;
2883	$h = 0 if $h < 0;	3118	$h = 0 if $h < 0;
2884		3119
2885	$widget->{w} = $w;	3120	$widget->{w} = $w;
2886	$widget->{h} = $h;	3121	$widget->{h} = $h;
2887	$widget->size_allocate ($w, $h);
2888	$widget->emit (size_allocate => $w, $h);	3122	$widget->emit (size_allocate => $w, $h);
2889	}	3123	}
2890	}	3124	}
2891		3125
2892	while ($self->{post_alloc_hook}) {	3126	while ($self->{post_alloc_hook}) {
…		…
2898	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3132	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2899	glClear GL_COLOR_BUFFER_BIT;	3133	glClear GL_COLOR_BUFFER_BIT;
2900		3134
2901	glMatrixMode GL_PROJECTION;	3135	glMatrixMode GL_PROJECTION;
2902	glLoadIdentity;	3136	glLoadIdentity;
2903	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3137	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2904	glMatrixMode GL_MODELVIEW;	3138	glMatrixMode GL_MODELVIEW;
2905	glLoadIdentity;	3139	glLoadIdentity;
2906		3140
2907	$self->_draw;	3141	$self->_draw;
2908	}	3142	}
…		…
2910	#############################################################################	3144	#############################################################################
2911		3145
2912	package CFClient::UI;	3146	package CFClient::UI;
2913		3147
2914	$ROOT = new CFClient::UI::Root;	3148	$ROOT = new CFClient::UI::Root;
2915	$TOOLTIP = new CFClient::UI::Tooltip;	3149	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2916		3150
2917	1	3151	1
2918		3152

Diff Legend

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