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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.240 by root, Fri May 26 18:28:23 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
13	our $ROOT;	14	our $ROOT;
14	our $TOOLTIP;	15	our $TOOLTIP;
15	our $BUTTON_STATE;	16	our $BUTTON_STATE;
		17
		18	our %WIDGET; # all widgets, weak-referenced
16		19
17	sub check_tooltip {	20	sub check_tooltip {
18	if (!$GRAB) {	21	if (!$GRAB) {
19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	22	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20	if (length $widget->{tooltip}) {	23	if (length $widget->{tooltip}) {
…		…
29	$TOOLTIP->set_tooltip_from ($widget);	32	$TOOLTIP->set_tooltip_from ($widget);
30	$TOOLTIP->show;	33	$TOOLTIP->show;
31		34
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	35	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		36
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	38	if $x + $TOOLTIP->{w} > $::WIDTH;
37		39
38	$TOOLTIP->move ($x, $y);	40	$TOOLTIP->move ($x, $y);
39	$TOOLTIP->check_size;	41	$TOOLTIP->check_size;
40	$TOOLTIP->update;	42	$TOOLTIP->update;
41	}	43	}
…		…
49	delete $TOOLTIP->{owner};	51	delete $TOOLTIP->{owner};
50	}	52	}
51		53
52	# class methods for events	54	# class methods for events
53	sub feed_sdl_key_down_event {	55	sub feed_sdl_key_down_event {
54	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	56	$FOCUS->emit (key_down => $_[0])
55	if $FOCUS;	57	if $FOCUS;
56	}	58	}
57		59
58	sub feed_sdl_key_up_event {	60	sub feed_sdl_key_up_event {
59	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	61	$FOCUS->emit (key_up => $_[0])
60	if $FOCUS;	62	if $FOCUS;
61	}	63	}
62		64
63	sub feed_sdl_button_down_event {	65	sub feed_sdl_button_down_event {
64	my ($ev) = @_;	66	my ($ev) = @_;
…		…
73	check_tooltip;	75	check_tooltip;
74	}	76	}
75		77
76	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
77		79
78	if ($GRAB) {	80	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79	($x, $y) = $GRAB->coord2local ($x, $y);	81	if $GRAB;
80	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81	}
82	}	82	}
83		83
84	sub feed_sdl_button_up_event {	84	sub feed_sdl_button_up_event {
85	my ($ev) = @_;	85	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	86	my ($x, $y) = ($ev->{x}, $ev->{y});
87		87
88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89		89
90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91		91
92	if ($GRAB) {	92	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93	($x, $y) = $GRAB->coord2local ($x, $y);	93	if $GRAB;
94	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95	}
96		94
97	if (!$BUTTON_STATE) {	95	if (!$BUTTON_STATE) {
98	my $grab = $GRAB; undef $GRAB;	96	my $grab = $GRAB; undef $GRAB;
99	$grab->update if $grab;	97	$grab->update if $grab;
100	$GRAB->update if $GRAB;	98	$GRAB->update if $GRAB;
…		…
116	$HOVER->update if $HOVER && $HOVER->{can_hover};	114	$HOVER->update if $HOVER && $HOVER->{can_hover};
117		115
118	check_tooltip;	116	check_tooltip;
119	}	117	}
120		118
121	if ($HOVER) {
122	($x, $y) = $HOVER->coord2local ($x, $y);
123	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	119	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124	}	120	if $HOVER;
125	}	121	}
126		122
127	# convert position array to integers	123	# convert position array to integers
128	sub harmonize {	124	sub harmonize {
129	my ($vals) = @_;	125	my ($vals) = @_;
…		…
133	for (@$vals) {	129	for (@$vals) {
134	my $i = int $_ + $rem;	130	my $i = int $_ + $rem;
135	$rem += $_ - $i;	131	$rem += $_ - $i;
136	$_ = $i;	132	$_ = $i;
137	}	133	}
		134	}
		135
		136	sub full_refresh {
		137	# make a copy, otherwise for complains about freed values.
		138	my @widgets = values %WIDGET;
		139
		140	$_->update
		141	for @widgets;
		142	}
		143
		144	sub reconfigure_widgets {
		145	# make a copy, otherwise C<for> complains about freed values.
		146	my @widgets = values %WIDGET;
		147
		148	$_->reconfigure
		149	for @widgets;
		150	}
		151
		152	# call when resolution changes etc.
		153	sub rescale_widgets {
		154	my ($sx, $sy) = @_;
		155
		156	for my $widget (values %WIDGET) {
		157	if ($widget->{is_toplevel}) {
		158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		166	}
		167	}
		168
		169	reconfigure_widgets;
138	}	170	}
139		171
140	#############################################################################	172	#############################################################################
141		173
142	package CFClient::UI::Base;	174	package CFClient::UI::Base;
…		…
160	if (/^connect_(.*)$/) {	192	if (/^connect_(.*)$/) {
161	$self->connect ($1 => delete $self->{$_});	193	$self->connect ($1 => delete $self->{$_});
162	}	194	}
163	}	195	}
164		196
		197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		198
165	$self	199	$self
166	}	200	}
167		201
168	sub destroy {	202	sub destroy {
169	my ($self) = @_;	203	my ($self) = @_;
…		…
172	%$self = ();	206	%$self = ();
173	}	207	}
174		208
175	sub show {	209	sub show {
176	my ($self) = @_;	210	my ($self) = @_;
177
178	return if $self->{parent};	211	return if $self->{parent};
179		212
180	$CFClient::UI::ROOT->add ($self);	213	$CFClient::UI::ROOT->add ($self);
181	}	214	}
182		215
183	sub hide {	216	sub show_centered {
184	my ($self) = @_;	217	my ($self) = @_;
		218	return if $self->{parent};
		219
		220	$self->show;
		221
		222	$CFClient::UI::ROOT->on_post_alloc (
		223	"centered $self" => sub {
		224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		225	},
		226	);
		227	}
		228
		229	sub set_invisible {
		230	my ($self) = @_;
		231
		232	# broken show/hide model
		233
		234	delete $self->{visible};
185		235
186	undef $GRAB if $GRAB == $self;	236	undef $GRAB if $GRAB == $self;
187	undef $HOVER if $HOVER == $self;	237	undef $HOVER if $HOVER == $self;
		238
		239	CFClient::UI::check_tooltip
		240	if $CFClient::UI::TOOLTIP->{owner} == $self;
		241
		242	$self->focus_out;
		243	}
		244
		245	sub hide {
		246	my ($self) = @_;
		247
		248	$self->set_invisible;
188		249
189	$self->{parent}->remove ($self)	250	$self->{parent}->remove ($self)
190	if $self->{parent};	251	if $self->{parent};
191	}	252	}
192		253
…		…
242		303
243	sub size_allocate {	304	sub size_allocate {
244	# nothing to be done	305	# nothing to be done
245	}	306	}
246		307
		308	sub reconfigure {
		309	my ($self) = @_;
		310
		311	$self->check_size (1);
		312	$self->update;
		313	}
		314
247	sub children {	315	sub children {
248	}
249
250	# call when resolution changes etc.
251	sub reconfigure {
252	my ($self) = @_;
253
254	$_->reconfigure
255	for $self->children;
256
257	$self->check_size;
258	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259	$self->update;
260	}	316	}
261		317
262	sub set_max_size {	318	sub set_max_size {
263	my ($self, $w, $h) = @_;	319	my ($self, $w, $h) = @_;
264		320
265	delete $self->{max_w}; $self->{max_w} = $w if $w;	321	delete $self->{max_w}; $self->{max_w} = $w if $w;
266	delete $self->{max_h}; $self->{max_h} = $h if $h;	322	delete $self->{max_h}; $self->{max_h} = $h if $h;
		323	}
		324
		325	sub set_tooltip {
		326	my ($self, $tooltip) = @_;
		327
		328	$tooltip =~ s/^\s+//;
		329	$tooltip =~ s/\s+$//;
		330
		331	return if $self->{tooltip} eq $tooltip;
		332
		333	$self->{tooltip} = $tooltip;
		334
		335	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		336	delete $CFClient::UI::TOOLTIP->{owner};
		337	CFClient::UI::check_tooltip;
		338	}
267	}	339	}
268		340
269	# translate global coordinates to local coordinate system	341	# translate global coordinates to local coordinate system
270	sub coord2local {	342	sub coord2local {
271	my ($self, $x, $y) = @_;	343	my ($self, $x, $y) = @_;
…		…
286	return if $FOCUS == $self;	358	return if $FOCUS == $self;
287	return unless $self->{can_focus};	359	return unless $self->{can_focus};
288		360
289	my $focus = $FOCUS; $FOCUS = $self;	361	my $focus = $FOCUS; $FOCUS = $self;
290		362
291	$self->emit (focus_in => $focus);	363	$self->_emit (focus_in => $focus);
292		364
293	$focus->update if $focus;	365	$focus->update if $focus;
294	$FOCUS->update;	366	$FOCUS->update;
295	}	367	}
296		368
…		…
299		371
300	return unless $FOCUS == $self;	372	return unless $FOCUS == $self;
301		373
302	my $focus = $FOCUS; undef $FOCUS;	374	my $focus = $FOCUS; undef $FOCUS;
303		375
304	$self->emit (focus_out => $focus);	376	$self->_emit (focus_out => $focus);
305		377
306	$focus->update if $focus; #?	378	$focus->update if $focus; #?
		379
		380	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		381	unless $FOCUS;
307	}	382	}
308		383
309	sub mouse_motion { }	384	sub mouse_motion { }
310	sub button_up { }	385	sub button_up { }
311	sub key_down { }	386	sub key_down { }
312	sub key_up { }	387	sub key_up { }
313		388
314	sub button_down {	389	sub button_down {
315	my ($self, $ev, $x, $y) = @_;	390	my ($self, $ev, $x, $y) = @_;
316		391
317	$self->focus_in;	392	$self->focus_in;
…		…
351	if ($ENV{PCLIENT_DEBUG}) {	426	if ($ENV{PCLIENT_DEBUG}) {
352	glPushMatrix;	427	glPushMatrix;
353	glColor 1, 1, 0, 1;	428	glColor 1, 1, 0, 1;
354	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	429	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
355	glBegin GL_LINE_LOOP;	430	glBegin GL_LINE_LOOP;
356	glVertex 0 , 0;	431	glVertex 0 , 0;
357	glVertex $self->{w}, 0;	432	glVertex $self->{w} - 1, 0;
358	glVertex $self->{w}, $self->{h};	433	glVertex $self->{w} - 1, $self->{h} - 1;
359	glVertex 0 , $self->{h};	434	glVertex 0 , $self->{h} - 1;
360	glEnd;	435	glEnd;
361	glPopMatrix;	436	glPopMatrix;
362	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	437	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
363	}	438	}
364	}	439	}
365		440
366	sub _draw {	441	sub _draw {
367	my ($self) = @_;	442	my ($self) = @_;
…		…
384	sub set_parent {	459	sub set_parent {
385	my ($self, $parent) = @_;	460	my ($self, $parent) = @_;
386		461
387	Scalar::Util::weaken ($self->{parent} = $parent);	462	Scalar::Util::weaken ($self->{parent} = $parent);
388		463
		464	$self->{root} = $parent->{root};
		465	$self->{visible} = $parent->{visible};
		466
		467	# TODO: req_w _does_change after ->reconfigure
389	$self->check_size	468	$self->check_size
390	unless exists $self->{req_w};	469	unless exists $self->{req_w};
		470
		471	$self->show;
391	}	472	}
392		473
393	sub check_size {	474	sub check_size {
394	my ($self, $forced) = @_;	475	my ($self, $forced) = @_;
395		476
…		…
408	my ($self, $signal, $cb) = @_;	489	my ($self, $signal, $cb) = @_;
409		490
410	push @{ $self->{signal_cb}{$signal} }, $cb;	491	push @{ $self->{signal_cb}{$signal} }, $cb;
411	}	492	}
412		493
		494	sub _emit {
		495	my ($self, $signal, @args) = @_;
		496
		497	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		498	}
		499
413	sub emit {	500	sub emit {
414	my ($self, $signal, @args) = @_;	501	my ($self, $signal, @args) = @_;
415		502
416	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	503	$self->_emit ($signal, @args)
		504	|| $self->$signal (@args);
417	}	505	}
418		506
419	sub DESTROY {	507	sub DESTROY {
420	my ($self) = @_;	508	my ($self) = @_;
421		509
		510	delete $WIDGET{$self+0};
422	#$self->deactivate;	511	#$self->deactivate;
423	}	512	}
424		513
425	#############################################################################	514	#############################################################################
426		515
…		…
435	my $class = shift;	524	my $class = shift;
436		525
437	# range [value, low, high, page]	526	# range [value, low, high, page]
438		527
439	$class->SUPER::new (	528	$class->SUPER::new (
440	bg => [0, 0, 0, 0.2],	529	#bg => [0, 0, 0, 0.2],
441	active_bg => [1, 1, 1, 0.5],	530	#active_bg => [1, 1, 1, 0.5],
442	@_	531	@_
443	)	532	)
444	}	533	}
445		534
446	sub _draw {	535	sub _draw {
447	my ($self) = @_;	536	my ($self) = @_;
448		537
		538	my $color = $FOCUS == $self && $self->{active_bg}
		539	? $self->{active_bg}
		540	: $self->{bg};
		541
		542	if ($color && (@$color < 4 || $color->[3])) {
449	my ($w, $h) = @$self{qw(w h)};	543	my ($w, $h) = @$self{qw(w h)};
450		544
451	glEnable GL_BLEND;	545	glEnable GL_BLEND;
452	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	546	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	547	glColor @$color;
454		548
455	glBegin GL_QUADS;	549	glBegin GL_QUADS;
456	glVertex 0 , 0;	550	glVertex 0 , 0;
457	glVertex 0 , $h;	551	glVertex 0 , $h;
458	glVertex $w, $h;	552	glVertex $w, $h;
459	glVertex $w, 0;	553	glVertex $w, 0;
460	glEnd;	554	glEnd;
461		555
462	glDisable GL_BLEND;	556	glDisable GL_BLEND;
		557	}
463	}	558	}
464		559
465	#############################################################################	560	#############################################################################
466		561
467	package CFClient::UI::Empty;	562	package CFClient::UI::Empty;
…		…
527	delete $child->{parent};	622	delete $child->{parent};
528	$child->hide;	623	$child->hide;
529		624
530	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	625	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531		626
532	$self->check_size;	627	$self->check_size (1);
533	$self->update;	628	$self->update;
534	}	629	}
535		630
536	sub clear {	631	sub clear {
537	my ($self) = @_;	632	my ($self) = @_;
…		…
628	}	723	}
629		724
630	sub update {	725	sub update {
631	my ($self) = @_;	726	my ($self) = @_;
632		727
633	$ROOT->on_refresh ($self => sub { $self->render_child });	728	$ROOT->on_post_alloc ($self => sub { $self->render_child });
634	$self->SUPER::update;	729	$self->SUPER::update;
635	}	730	}
636		731
637	sub size_allocate {	732	sub size_allocate {
638	my ($self, $w, $h) = @_;	733	my ($self, $w, $h) = @_;
…		…
651	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	746	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652	glClearColor 0, 0, 0, 0;	747	glClearColor 0, 0, 0, 0;
653	glClear GL_COLOR_BUFFER_BIT;	748	glClear GL_COLOR_BUFFER_BIT;
654		749
655	$self->_render;	750	$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	};	751	};
664	}	752	}
665		753
666	sub _draw {	754	sub _draw {
667	my ($self) = @_;	755	my ($self) = @_;
…		…
671	my $tex = $self->{texture}	759	my $tex = $self->{texture}
672	or return;	760	or return;
673		761
674	glEnable GL_TEXTURE_2D;	762	glEnable GL_TEXTURE_2D;
675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	763	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676	glColor 0, 0, 0, 1;	764	glColor 1, 1, 1, 1;
677		765
678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	766	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679		767
680	glDisable GL_TEXTURE_2D;	768	glDisable GL_TEXTURE_2D;
681	}	769	}
…		…
684		772
685	package CFClient::UI::ViewPort;	773	package CFClient::UI::ViewPort;
686		774
687	our @ISA = CFClient::UI::Window::;	775	our @ISA = CFClient::UI::Window::;
688		776
		777	sub new {
		778	my $class = shift;
		779
		780	$class->SUPER::new (
		781	scroll_x => 0,
		782	scroll_y => 1,
		783	@_,
		784	)
		785	}
		786
689	sub size_request {	787	sub size_request {
690	my ($self) = @_;	788	my ($self) = @_;
691		789
692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	790	@$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		791
695	@$self{qw(child_w child_h)}	792	@$self{qw(child_w child_h)}
696	}	793	}
697		794
698	sub size_allocate {	795	sub size_allocate {
699	my ($self, $w, $h) = @_;	796	my ($self, $w, $h) = @_;
700		797
		798	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		799	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		800
		801	$self->child->configure (0, 0, $w, $h);
701	$self->update;	802	$self->update;
702	}	803	}
703		804
704	sub set_offset {	805	sub set_offset {
705	my ($self, $x, $y) = @_;	806	my ($self, $x, $y) = @_;
…		…
759		860
760	my $slider = new CFClient::UI::Slider	861	my $slider = new CFClient::UI::Slider
761	vertical => 1,	862	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	863	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	864	connect_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	865	$self->{vp}->set_offset (0, $_[1]);
765	},	866	},
766	;	867	;
767		868
768	$self = $class->SUPER::new (	869	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	870	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	871	slider => $slider,
771	@_,	872	@_,
772	);	873	);
773		874
774	$self->{vp}->add ($self->{scrolled});	875	$self->{vp}->add ($self->{scrolled});
…		…
776	$self->add ($self->{slider});	877	$self->add ($self->{slider});
777		878
778	$self	879	$self
779	}	880	}
780		881
		882	sub update {
		883	my ($self) = @_;
		884
		885	$self->SUPER::update;
		886
		887	# todo: overwrite size_allocate of child
		888	my $child = $self->{vp}->child;
		889	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		890	}
		891
		892	sub size_allocate {
		893	my ($self, $w, $h) = @_;
		894
		895	$self->SUPER::size_allocate ($w, $h);
		896
		897	my $child = $self->{vp}->child;
		898	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		899	}
		900
781	#TODO# update range on size_allocate depeneing on child	901	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	902	# update viewport offset on scroll
783		903
784	#############################################################################	904	#############################################################################
785		905
786	package CFClient::UI::Frame;	906	package CFClient::UI::Frame;
787		907
788	our @ISA = CFClient::UI::Bin::;	908	our @ISA = CFClient::UI::Bin::;
789		909
790	use CFClient::OpenGL;	910	use CFClient::OpenGL;
		911
		912	sub new {
		913	my $class = shift;
		914
		915	$class->SUPER::new (
		916	bg => undef,
		917	@_,
		918	)
		919	}
		920
		921	sub _draw {
		922	my ($self) = @_;
		923
		924	if ($self->{bg}) {
		925	my ($w, $h) = @$self{qw(w h)};
		926
		927	glEnable GL_BLEND;
		928	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		929	glColor @{ $self->{bg} };
		930
		931	glBegin GL_QUADS;
		932	glVertex 0 , 0;
		933	glVertex 0 , $h;
		934	glVertex $w, $h;
		935	glVertex $w, 0;
		936	glEnd;
		937
		938	glDisable GL_BLEND;
		939	}
		940
		941	$self->SUPER::_draw;
		942	}
791		943
792	#############################################################################	944	#############################################################################
793		945
794	package CFClient::UI::FancyFrame;	946	package CFClient::UI::FancyFrame;
795		947
…		…
805	my $class = shift;	957	my $class = shift;
806		958
807	# TODO: user_x, user_y, overwrite moveto?	959	# TODO: user_x, user_y, overwrite moveto?
808		960
809	my $self = $class->SUPER::new (	961	my $self = $class->SUPER::new (
810	bg => [1, 1, 1, 1],	962	bg => [1, 1, 1, 1],
811	border_bg => [1, 1, 1, 1],	963	border_bg => [1, 1, 1, 1],
812	border => 0.6,	964	border => 0.6,
		965	is_toplevel => 1,
813	can_events => 1,	966	can_events => 1,
814	@_	967	@_
815	);	968	);
816		969
817	$self->{title} &&= new CFClient::UI::Label	970	$self->{title} &&= new CFClient::UI::Label
818	align => 0,	971	align => 0,
…		…
842	my ($self, $w, $h) = @_;	995	my ($self, $w, $h) = @_;
843		996
844	$h -= List::Util::max 0, $self->border * 2;	997	$h -= List::Util::max 0, $self->border * 2;
845	$w -= List::Util::max 0, $self->border * 2;	998	$w -= List::Util::max 0, $self->border * 2;
846		999
847	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1000	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
848	if $self->{title};	1001	if $self->{title};
849		1002
850	$self->child->configure ($self->border, $self->border, $w, $h);	1003	$self->child->configure ($self->border, $self->border, $w, $h);
851	}	1004	}
852		1005
…		…
958	sub new {	1111	sub new {
959	my $class = shift;	1112	my $class = shift;
960		1113
961	$class->SUPER::new (	1114	$class->SUPER::new (
962	col_expand => [],	1115	col_expand => [],
963	@_	1116	@_,
964	)	1117	)
		1118	}
		1119
		1120	sub children {
		1121	grep $_, map @$_, grep $_, @{ $_[0]{children} }
965	}	1122	}
966		1123
967	sub add {	1124	sub add {
968	my ($self, $x, $y, $child) = @_;	1125	my ($self, $x, $y, $child) = @_;
969		1126
970	$child->set_parent ($self);	1127	$child->set_parent ($self);
971	$self->{children}[$y][$x] = $child;	1128	$self->{children}[$y][$x] = $child;
972		1129
973	$child->check_size;	1130	$self->check_size (1);
974	}	1131	}
975		1132
976	sub children {
977	grep $_, map @$_, grep $_, @{ $_[0]{children} }
978	}
979
980	# TODO: move to container class maybe? send childs a signal on removal?	1133	# TODO: move to container class maybe? send children a signal on removal?
981	sub clear {	1134	sub clear {
982	my ($self) = @_;	1135	my ($self) = @_;
983		1136
984	my @children = $self->children;	1137	my @children = $self->children;
985	delete $self->{children};	1138	delete $self->{children};
…		…
987	for (@children) {	1140	for (@children) {
988	delete $_->{parent};	1141	delete $_->{parent};
989	$_->hide;	1142	$_->hide;
990	}	1143	}
991		1144
		1145	$self->check_size (1);
992	$self->update;	1146	$self->update;
993	}	1147	}
994		1148
995	sub get_wh {	1149	sub get_wh {
996	my ($self) = @_;	1150	my ($self) = @_;
…		…
1028	sub size_allocate {	1182	sub size_allocate {
1029	my ($self, $w, $h) = @_;	1183	my ($self, $w, $h) = @_;
1030		1184
1031	my ($ws, $hs) = $self->get_wh;	1185	my ($ws, $hs) = $self->get_wh;
1032		1186
1033	my $req_w = sum @$ws;	1187	my $req_w = (sum @$ws) || 1;
1034	my $req_h = sum @$hs;	1188	my $req_h = (sum @$hs) || 1;
1035		1189
1036	# TODO: nicer code && do row_expand	1190	# TODO: nicer code && do row_expand
1037	my @col_expand = @{$self->{col_expand}};	1191	my @col_expand = @{$self->{col_expand}};
1038	@col_expand = (1) x @$ws unless @col_expand;	1192	@col_expand = (1) x @$ws unless @col_expand;
1039	my $col_expand = (sum @col_expand) || 1;	1193	my $col_expand = (sum @col_expand) || 1;
…		…
1213		1367
1214	#############################################################################	1368	#############################################################################
1215		1369
1216	package CFClient::UI::Label;	1370	package CFClient::UI::Label;
1217		1371
1218	our @ISA = CFClient::UI::Base::;	1372	our @ISA = CFClient::UI::DrawBG::;
1219		1373
1220	use CFClient::OpenGL;	1374	use CFClient::OpenGL;
1221		1375
1222	sub new {	1376	sub new {
1223	my ($class, %arg) = @_;	1377	my ($class, %arg) = @_;
1224		1378
1225	my $self = $class->SUPER::new (	1379	my $self = $class->SUPER::new (
1226	fg => [1, 1, 1],	1380	fg => [1, 1, 1],
		1381	#bg => none
		1382	#active_bg => none
1227	#font => default_font	1383	#font => default_font
1228	#text => initial text	1384	#text => initial text
1229	#markup => initial narkup	1385	#markup => initial narkup
		1386	#max_w => maximum pixel width
		1387	ellipsise => 3, # end
1230	layout => (new CFClient::Layout),	1388	layout => (new CFClient::Layout),
1231	fontsize => 1,	1389	fontsize => 1,
1232	align => -1,	1390	align => -1,
1233	valign => -1,	1391	valign => -1,
1234	padding => 2,	1392	padding => 2,
…		…
1249	}	1407	}
1250		1408
1251	$self	1409	$self
1252	}	1410	}
1253		1411
1254	sub escape {	1412	sub escape($) {
1255	local $_ = $_[1];	1413	local $_ = $_[0];
1256		1414
1257	s/&/&amp;/g;	1415	s/&/&amp;/g;
1258	s/>/&gt;/g;	1416	s/>/&gt;/g;
1259	s/</&lt;/g;	1417	s/</&lt;/g;
1260		1418
1261	$_[1]	1419	$_
1262	}	1420	}
1263		1421
1264	sub update {	1422	sub update {
1265	my ($self) = @_;	1423	my ($self) = @_;
1266		1424
…		…
1299	sub size_request {	1457	sub size_request {
1300	my ($self) = @_;	1458	my ($self) = @_;
1301		1459
1302	$self->{layout}->set_font ($self->{font}) if $self->{font};	1460	$self->{layout}->set_font ($self->{font}) if $self->{font};
1303	$self->{layout}->set_width ($self->{max_w} || -1);	1461	$self->{layout}->set_width ($self->{max_w} || -1);
		1462	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1463	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1464	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305		1465
1306	my ($w, $h) = $self->{layout}->size;	1466	my ($w, $h) = $self->{layout}->size;
1307		1467
1308	if (exists $self->{template}) {	1468	if (exists $self->{template}) {
…		…
1338	}	1498	}
1339		1499
1340	sub _draw {	1500	sub _draw {
1341	my ($self) = @_;	1501	my ($self) = @_;
1342		1502
		1503	$self->SUPER::_draw; # draw background, if applicable
		1504
1343	my $tex = $self->{texture} ||= do {	1505	my $tex = $self->{texture} ||= do {
1344	$self->{layout}->set_foreground (@{$self->{fg}});	1506	$self->{layout}->set_foreground (@{$self->{fg}});
1345	$self->{layout}->set_font ($self->{font}) if $self->{font};	1507	$self->{layout}->set_font ($self->{font}) if $self->{font};
1346	$self->{layout}->set_width ($self->{w});	1508	$self->{layout}->set_width ($self->{w});
		1509	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1510	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1347	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1511	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348		1512
1349	my $tex = new_from_layout CFClient::Texture $self->{layout};	1513	my $tex = new_from_layout CFClient::Texture $self->{layout};
1350		1514
1351	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1515	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1352	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1516	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353	: ($self->{w} - $tex->{w}) * 0.5;	1517	: ($self->{w} - $tex->{w}) * 0.5);
1354		1518
1355	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1519	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1356	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1520	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357	: ($self->{h} - $tex->{h}) * 0.5;	1521	: ($self->{h} - $tex->{h}) * 0.5);
1358		1522
1359	$tex	1523	$tex
1360	};	1524	};
1361		1525
1362	glEnable GL_TEXTURE_2D;	1526	glEnable GL_TEXTURE_2D;
…		…
1390	active_fg => [0, 0, 0],	1554	active_fg => [0, 0, 0],
1391	can_hover => 1,	1555	can_hover => 1,
1392	can_focus => 1,	1556	can_focus => 1,
1393	valign => 0,	1557	valign => 0,
1394	can_events => 1,	1558	can_events => 1,
		1559	#text => ...
1395	@_	1560	@_
1396	)	1561	)
1397	}	1562	}
1398		1563
1399	sub _set_text {	1564	sub _set_text {
…		…
1409	$self->{text} = $text;	1574	$self->{text} = $text;
1410		1575
1411	$text =~ s/./*/g if $self->{hidden};	1576	$text =~ s/./*/g if $self->{hidden};
1412	$self->{layout}->set_text ("$text ");	1577	$self->{layout}->set_text ("$text ");
1413		1578
1414	$self->emit (changed => $self->{text});	1579	$self->_emit (changed => $self->{text});
1415	}	1580	}
1416		1581
1417	sub set_text {	1582	sub set_text {
1418	my ($self, $text) = @_;	1583	my ($self, $text) = @_;
1419		1584
1420	$self->{cursor} = length $text;	1585	$self->{cursor} = length $text;
1421	$self->_set_text ($text);	1586	$self->_set_text ($text);
		1587	$self->update;
1422	$self->check_size;	1588	$self->check_size;
1423	$self->update;
1424	}	1589	}
1425		1590
1426	sub get_text {	1591	sub get_text {
1427	$_[0]{text}	1592	$_[0]{text}
1428	}	1593	}
…		…
1431	my ($self) = @_;	1596	my ($self) = @_;
1432		1597
1433	my ($w, $h) = $self->SUPER::size_request;	1598	my ($w, $h) = $self->SUPER::size_request;
1434		1599
1435	($w + 1, $h) # add 1 for cursor	1600	($w + 1, $h) # add 1 for cursor
1436	}
1437
1438	sub size_allocate {
1439	my ($self, $w, $h) = @_;
1440
1441	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1442	}	1601	}
1443		1602
1444	sub key_down {	1603	sub key_down {
1445	my ($self, $ev) = @_;	1604	my ($self, $ev) = @_;
1446		1605
…		…
1448	my $sym = $ev->{sym};	1607	my $sym = $ev->{sym};
1449	my $uni = $ev->{unicode};	1608	my $uni = $ev->{unicode};
1450		1609
1451	my $text = $self->get_text;	1610	my $text = $self->get_text;
1452		1611
1453	if ($sym == 8) {	1612	if ($uni == 8) {
1454	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1613	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455	} elsif ($sym == 127) {	1614	} elsif ($uni == 127) {
1456	substr $text, $self->{cursor}, 1, "";	1615	substr $text, $self->{cursor}, 1, "";
1457	} elsif ($sym == CFClient::SDLK_LEFT) {	1616	} elsif ($sym == CFClient::SDLK_LEFT) {
1458	--$self->{cursor} if $self->{cursor};	1617	--$self->{cursor} if $self->{cursor};
1459	} elsif ($sym == CFClient::SDLK_RIGHT) {	1618	} elsif ($sym == CFClient::SDLK_RIGHT) {
1460	++$self->{cursor} if $self->{cursor} < length $self->{text};	1619	++$self->{cursor} if $self->{cursor} < length $self->{text};
1461	} elsif ($sym == CFClient::SDLK_HOME) {	1620	} elsif ($sym == CFClient::SDLK_HOME) {
1462	$self->{cursor} = 0;	1621	$self->{cursor} = 0;
1463	} elsif ($sym == CFClient::SDLK_END) {	1622	} elsif ($sym == CFClient::SDLK_END) {
1464	$self->{cursor} = length $text;	1623	$self->{cursor} = length $text;
1465	} elsif ($sym == 27) {	1624	} elsif ($uni == 27) {
1466	$self->emit ('escape');	1625	$self->_emit ('escape');
1467	} elsif ($uni) {	1626	} elsif ($uni) {
1468	substr $text, $self->{cursor}++, 0, chr $uni;	1627	substr $text, $self->{cursor}++, 0, chr $uni;
1469	}	1628	}
1470		1629
1471	$self->_set_text ($text);	1630	$self->_set_text ($text);
1472	$self->update;	1631	$self->update;
		1632	$self->check_size;
1473	}	1633	}
1474		1634
1475	sub focus_in {	1635	sub focus_in {
1476	my ($self) = @_;	1636	my ($self) = @_;
1477		1637
…		…
1557	if ($sym == 13) {	1717	if ($sym == 13) {
1558	unshift @{$self->{history}},	1718	unshift @{$self->{history}},
1559	my $txt = $self->get_text;	1719	my $txt = $self->get_text;
1560	$self->{history_pointer} = -1;	1720	$self->{history_pointer} = -1;
1561	$self->{history_saveback} = '';	1721	$self->{history_saveback} = '';
1562	$self->emit (activate => $txt);	1722	$self->_emit (activate => $txt);
1563	$self->update;	1723	$self->update;
1564		1724
1565	} elsif ($sym == CFClient::SDLK_UP) {	1725	} elsif ($sym == CFClient::SDLK_UP) {
1566	if ($self->{history_pointer} < 0) {	1726	if ($self->{history_pointer} < 0) {
1567	$self->{history_saveback} = $self->get_text;	1727	$self->{history_saveback} = $self->get_text;
…		…
1606	my $class = shift;	1766	my $class = shift;
1607		1767
1608	$class->SUPER::new (	1768	$class->SUPER::new (
1609	padding => 4,	1769	padding => 4,
1610	fg => [1, 1, 1],	1770	fg => [1, 1, 1],
1611	bg => [1, 1, 1, 0.2],
1612	active_fg => [0, 0, 1],	1771	active_fg => [0, 0, 1],
1613	can_hover => 1,	1772	can_hover => 1,
1614	align => 0,	1773	align => 0,
1615	valign => 0,	1774	valign => 0,
1616	can_events => 1,	1775	can_events => 1,
1617	@_	1776	@_
1618	)	1777	)
1619	}	1778	}
1620		1779
		1780	sub activate { }
		1781
1621	sub button_up {	1782	sub button_up {
1622	my ($self, $ev, $x, $y) = @_;	1783	my ($self, $ev, $x, $y) = @_;
1623		1784
		1785	$self->emit ("activate")
1624	if ($x >= 0 && $x < $self->{w}	1786	if $x >= 0 && $x < $self->{w}
1625	&& $y >= 0 && $y < $self->{h}) {	1787	&& $y >= 0 && $y < $self->{h};
1626	$self->emit ("activate");
1627	}
1628	}	1788	}
1629		1789
1630	sub _draw {	1790	sub _draw {
1631	my ($self) = @_;	1791	my ($self) = @_;
1632		1792
…		…
1664		1824
1665	$class->SUPER::new (	1825	$class->SUPER::new (
1666	padding => 2,	1826	padding => 2,
1667	fg => [1, 1, 1],	1827	fg => [1, 1, 1],
1668	active_fg => [1, 1, 0],	1828	active_fg => [1, 1, 0],
		1829	bg => [0, 0, 0, 0.2],
		1830	active_bg => [1, 1, 1, 0.5],
1669	state => 0,	1831	state => 0,
1670	can_hover => 1,	1832	can_hover => 1,
1671	@_	1833	@_
1672	)	1834	)
1673	}	1835	}
…		…
1682	my ($self, $ev, $x, $y) = @_;	1844	my ($self, $ev, $x, $y) = @_;
1683		1845
1684	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1846	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1685	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1847	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1686	$self->{state} = !$self->{state};	1848	$self->{state} = !$self->{state};
1687	$self->emit (changed => $self->{state});	1849	$self->_emit (changed => $self->{state});
1688	}	1850	}
1689	}	1851	}
1690		1852
1691	sub _draw {	1853	sub _draw {
1692	my ($self) = @_;	1854	my ($self) = @_;
…		…
1957	qw(s1_slider.png s1_slider_bg.png);	2119	qw(s1_slider.png s1_slider_bg.png);
1958		2120
1959	sub new {	2121	sub new {
1960	my $class = shift;	2122	my $class = shift;
1961		2123
1962	# range [value, low, high, page]	2124	# range [value, low, high, page, unit]
1963		2125
1964	# TODO: 0-width page	2126	# TODO: 0-width page
1965	# TODO: req_w/h are wrong with vertical	2127	# TODO: req_w/h are wrong with vertical
1966	# TODO: calculations are off	2128	# TODO: calculations are off
1967	my $self = $class->SUPER::new (	2129	my $self = $class->SUPER::new (
1968	fg => [1, 1, 1],	2130	fg => [1, 1, 1],
1969	active_fg => [0, 0, 0],	2131	active_fg => [0, 0, 0],
		2132	bg => [0, 0, 0, 0.2],
		2133	active_bg => [1, 1, 1, 0.5],
1970	range => [0, 0, 100, 10],	2134	range => [0, 0, 100, 10, 0],
1971	req_w => $::WIDTH / 80,	2135	req_w => $::WIDTH / 80,
1972	req_h => $::WIDTH / 80,	2136	req_h => $::WIDTH / 80,
1973	vertical => 0,	2137	vertical => 0,
1974	can_hover => 1,	2138	can_hover => 1,
1975	inner_pad => 5,	2139	inner_pad => 0.02,
1976	@_	2140	@_
1977	);	2141	);
1978		2142
		2143	$self->set_value ($self->{range}[0]);
		2144	$self->update;
		2145
1979	$self	2146	$self
		2147	}
		2148
		2149	sub set_range {
		2150	my ($self, $range) = @_;
		2151
		2152	($range, $self->{range}) = ($self->{range}, $range);
		2153
		2154	$self->update
		2155	if "@$range" ne "@{$self->{range}}";
		2156	}
		2157
		2158	sub set_value {
		2159	my ($self, $value) = @_;
		2160
		2161	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2162
		2163	$hi = $lo + 1 if $hi <= $lo;
		2164
		2165	$page = $hi - $lo if $page > $hi - $lo;
		2166
		2167	$value = $lo if $value < $lo;
		2168	$value = $hi - $page if $value > $hi - $page;
		2169
		2170	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2171	if $unit;
		2172
		2173	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2174
		2175	if ($value != $old_value) {
		2176	$self->_emit (changed => $value);
		2177	$self->update;
		2178	}
1980	}	2179	}
1981		2180
1982	sub size_request {	2181	sub size_request {
1983	my ($self) = @_;	2182	my ($self) = @_;
1984		2183
…		…
1990		2189
1991	sub button_down {	2190	sub button_down {
1992	my ($self, $ev, $x, $y) = @_;	2191	my ($self, $ev, $x, $y) = @_;
1993		2192
1994	$self->SUPER::button_down ($ev, $x, $y);	2193	$self->SUPER::button_down ($ev, $x, $y);
		2194
		2195	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2196
1995	$self->mouse_motion ($ev, $x, $y);	2197	$self->mouse_motion ($ev, $x, $y);
1996	}	2198	}
1997		2199
1998	sub mouse_motion {	2200	sub mouse_motion {
1999	my ($self, $ev, $x, $y) = @_;	2201	my ($self, $ev, $x, $y) = @_;
2000		2202
2001	if ($GRAB == $self) {	2203	if ($GRAB == $self) {
		2204	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2205
		2206	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2207
		2208	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2209
		2210	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2211	}
		2212	}
		2213
		2214	sub update {
		2215	my ($self) = @_;
		2216
		2217	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2218	$self->set_value ($self->{range}[0]);
		2219
2002	my ($value, $lo, $hi, $page) = @{$self->{range}};	2220	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2221	my $range = ($hi - $page - $lo) || 1e-100;
2003		2222
2004	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2223	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2005		2224
2006	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2225	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2007	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2226	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2008		2227
2009	$x -= $inner_pad_px; # substract the padding	2228	$value = ($value - $lo) / $range;
2010	$x = $x * ($hi - $lo) / $inner_w + $lo;	2229	$value = $value * $self->{scale} + $self->{offset};
2011	$x = $lo if $x < $lo;
2012	$x = $hi - $page if $x > $hi - $page;
2013	$self->{range}[0] = $x;
2014		2230
2015	$self->emit (changed => $x);	2231	$self->{knob_x} = $value - $knob_w * 0.5;
2016	$self->update;	2232	$self->{knob_w} = $knob_w;
2017	}	2233	});
2018	}
2019		2234
2020	# the inner_* stuff is for generating a padding for the slider handle,	2235	$self->SUPER::update;
2021	# so that the handle doesn't leave the texture. This calculation isn't 100%
2022	# correct propably, but it does the job for now
2023	sub _calc_inner_pad_px {
2024	my ($self, $w) = @_;
2025	($w / 100) * $self->{inner_pad} # % to pixels
2026	}	2236	}
2027		2237
2028	sub _draw {	2238	sub _draw {
2029	my ($self) = @_;	2239	my ($self) = @_;
2030		2240
2031	$self->SUPER::_draw ();	2241	$self->SUPER::_draw ();
2032		2242
2033	my ($w, $h) = @$self{qw(w h)};	2243	glScale $self->{w}, $self->{h};
2034		2244
2035	if ($self->{vertical}) {	2245	if ($self->{vertical}) {
2036	# draw a vertical slider like a rotated horizontal slider	2246	# draw a vertical slider like a rotated horizontal slider
2037		2247
		2248	glTranslate 1, 0, 0;
2038	glRotate 90, 0, 0, 1;	2249	glRotate 90, 0, 0, 1;
2039	glTranslate 0, -$self->{w}, 0;
2040
2041	($w, $h) = ($h, $w);
2042	}	2250	}
2043		2251
2044	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2252	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2253	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046		2254
2047	my ($value, $lo, $hi, $page) = @{$self->{range}};
2048
2049	$hi = $value + 1 if $lo == $hi;
2050
2051	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2052	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2053
2054	$page = int $page * $inner_w / ($hi - $lo);
2055	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2056
2057	$w -= $page;
2058	$page &= ~1;
2059	glTranslate $page * 0.5, 0, 0;
2060	$page ||= 2;
2061
2062	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2063	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2064
2065	glEnable GL_TEXTURE_2D;	2255	glEnable GL_TEXTURE_2D;
2066	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2256	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067		2257
2068	# draw background	2258	# draw background
2069	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2259	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070		2260
2071	# draw handle	2261	# draw handle
2072	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2262	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2073		2263
2074	glDisable GL_TEXTURE_2D;	2264	glDisable GL_TEXTURE_2D;
2075	}	2265	}
		2266
		2267	#############################################################################
		2268
		2269	package CFClient::UI::ValSlider;
		2270
		2271	our @ISA = CFClient::UI::HBox::;
		2272
		2273	sub new {
		2274	my ($class, %arg) = @_;
		2275
		2276	my $range = delete $arg{range};
		2277
		2278	my $self = $class->SUPER::new (
		2279	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2280	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2281	to_value => sub { shift },
		2282	from_value => sub { shift },
		2283	%arg,
		2284	);
		2285
		2286	$self->{slider}->connect (changed => sub {
		2287	my ($self, $value) = @_;
		2288	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2289	$self->{parent}->emit (changed => $value);
		2290	});
		2291
		2292	# $self->{entry}->connect (changed => sub {
		2293	# my ($self, $value) = @_;
		2294	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2295	# $self->{parent}->emit (changed => $value);
		2296	# });
		2297
		2298	$self->add ($self->{slider}, $self->{entry});
		2299
		2300	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2301
		2302	$self
		2303	}
		2304
		2305	sub set_range { shift->{slider}->set_range (@_) }
		2306	sub set_value { shift->{slider}->set_value (@_) }
2076		2307
2077	#############################################################################	2308	#############################################################################
2078		2309
2079	package CFClient::UI::TextView;	2310	package CFClient::UI::TextView;
2080		2311
…		…
2110		2341
2111	$self->{fontsize} = $fontsize;	2342	$self->{fontsize} = $fontsize;
2112	$self->reflow;	2343	$self->reflow;
2113	}	2344	}
2114		2345
2115	sub text_height {
2116	my ($self, $text) = @_;
2117
2118	my $layout = $self->{layout};
2119
2120	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2121	$layout->set_width ($self->{children}[0]{w});
2122	$layout->set_markup ($text);
2123
2124	($layout->size)[1]
2125	}
2126
2127	sub reflow {
2128	my ($self) = @_;
2129
2130	$self->{need_reflow}++;
2131	$self->update;
2132	}
2133
2134	sub size_allocate {	2346	sub size_allocate {
2135	my ($self, $w, $h) = @_;	2347	my ($self, $w, $h) = @_;
2136		2348
2137	$self->SUPER::size_allocate ($w, $h);	2349	$self->SUPER::size_allocate ($w, $h);
2138		2350
…		…
2141	$self->{layout}->set_width ($self->{children}[0]{w});	2353	$self->{layout}->set_width ($self->{children}[0]{w});
2142		2354
2143	$self->reflow;	2355	$self->reflow;
2144	}	2356	}
2145		2357
		2358	sub text_size {
		2359	my ($self, $text, $indent) = @_;
		2360
		2361	my $layout = $self->{layout};
		2362
		2363	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2364	$layout->set_width ($self->{children}[0]{w} - $indent);
		2365	$layout->set_markup ($text);
		2366
		2367	$layout->size
		2368	}
		2369
		2370	sub reflow {
		2371	my ($self) = @_;
		2372
		2373	$self->{need_reflow}++;
		2374	$self->update;
		2375	}
		2376
		2377	sub set_offset {
		2378	my ($self, $offset) = @_;
		2379
		2380	# todo: base offset on lines or so, not on pixels
		2381	$self->{children}[1]->set_value ($offset);
		2382	}
		2383
		2384	sub clear {
		2385	my ($self) = @_;
		2386
		2387	$self->{par} = [];
		2388	$self->{height} = 0;
		2389	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2390	}
		2391
2146	sub add_paragraph {	2392	sub add_paragraph {
2147	my ($self, $color, $text) = @_;	2393	my ($self, $color, $text, $indent) = @_;
2148		2394
2149	#TODO: intelligently "reformat" paragraph	2395	for my $line (split /\n/, $text) {
2150		2396	my ($w, $h) = $self->text_size ($line);
2151	my $height = $self->text_height ($text);
2152
2153	$self->{height} += $height;	2397	$self->{height} += $h;
		2398	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2399	}
2154		2400
2155	push @{$self->{par}}, [$height, $color, $text];
2156
2157	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2401	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2158	$self->{children}[1]->update;
2159	}	2402	}
2160		2403
2161	sub update {	2404	sub update {
2162	my ($self) = @_;	2405	my ($self) = @_;
2163		2406
…		…
2165		2408
2166	return unless $self->{h} > 0;	2409	return unless $self->{h} > 0;
2167		2410
2168	delete $self->{texture};	2411	delete $self->{texture};
2169		2412
2170	$ROOT->on_refresh ($self, sub {	2413	$ROOT->on_post_alloc ($self, sub {
		2414	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2415
2171	if (delete $self->{need_reflow}) {	2416	if (delete $self->{need_reflow}) {
2172	my $height = 0;	2417	my $height = 0;
2173		2418
2174	$height += $_->[0] = $self->text_height ($_->[2])	2419	my $layout = $self->{layout};
		2420
		2421	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2422
2175	for @{$self->{par}};	2423	for (@{$self->{par}}) {
		2424	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2425	$layout->set_width ($W - $_->[3]);
		2426	$layout->set_markup ($_->[4]);
		2427	my ($w, $h) = $layout->size;
		2428	$_->[0] = $w + $_->[3];
		2429	$_->[1] = $h;
		2430	}
		2431
		2432	$height += $_->[1];
		2433	}
2176		2434
2177	$self->{height} = $height;	2435	$self->{height} = $height;
2178		2436
2179	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2437	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2180		2438
2181	delete $self->{texture};	2439	delete $self->{texture};
2182	}	2440	}
2183		2441
2184	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2442	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2185	glClearColor 0, 0, 0, 0;	2443	glClearColor 0.5, 0.5, 0.5, 0;
2186	glClear GL_COLOR_BUFFER_BIT;	2444	glClear GL_COLOR_BUFFER_BIT;
2187		2445
2188	glEnable GL_TEXTURE_2D;
2189	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2190
2191	my $top = int $self->{children}[1]{range}[0];	2446	my $top = int $self->{children}[1]{range}[0];
2192		2447
2193	my $y0 = $top;	2448	my $y0 = $top;
2194	my $y1 = $top + $self->{h};	2449	my $y1 = $top + $H;
2195		2450
2196	my $y = 0;	2451	my $y = 0;
2197		2452
2198	my $layout = $self->{layout};	2453	my $layout = $self->{layout};
2199		2454
2200	$layout->set_font ($self->{font}) if $self->{font};	2455	$layout->set_font ($self->{font}) if $self->{font};
2201		2456
		2457	glEnable GL_BLEND;
		2458	#TODO# not correct in windows where rgba is forced off
		2459	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2460
2202	for my $par (@{$self->{par}}) {	2461	for my $par (@{$self->{par}}) {
2203	my $h = $par->[0];	2462	my $h = $par->[1];
2204		2463
2205	if ($y0 < $y + $h && $y < $y1) {	2464	if ($y0 < $y + $h && $y < $y1) {
2206	$layout->set_foreground (@{ $par->[1] });	2465	$layout->set_foreground (@{ $par->[2] });
		2466	$layout->set_width ($W - $par->[3]);
2207	$layout->set_markup ($par->[2]);	2467	$layout->set_markup ($par->[4]);
2208		2468
2209	my ($W, $H) = $layout->size;	2469	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2210	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2470
		2471	glRasterPos $par->[3], $y - $y0;
		2472	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2211	}	2473	}
2212		2474
2213	$y += $h;	2475	$y += $h;
2214	}	2476	}
2215		2477
2216	glDisable GL_TEXTURE_2D;	2478	glDisable GL_BLEND;
2217	};	2479	};
2218	});	2480	});
2219	}	2481	}
2220		2482
2221	sub _draw {	2483	sub _draw {
2222	my ($self) = @_;	2484	my ($self) = @_;
2223		2485
2224	glEnable GL_TEXTURE_2D;	2486	glEnable GL_TEXTURE_2D;
2225	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2487	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226	glColor 1, 1, 1, 1;	2488	glColor 1, 1, 1, 1;
2227	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2489	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2228	glDisable GL_TEXTURE_2D;	2490	glDisable GL_TEXTURE_2D;
2229		2491
2230	$self->{children}[1]->draw;	2492	$self->{children}[1]->draw;
2231		2493
2232	}	2494	}
…		…
2301		2563
2302	# TODO: use animation	2564	# TODO: use animation
2303	if ($self->{state} = !$self->{state}) {	2565	if ($self->{state} = !$self->{state}) {
2304	$CFClient::UI::ROOT->add ($self->{other});	2566	$CFClient::UI::ROOT->add ($self->{other});
2305	$self->{other}->move ($self->coord2global (0, $self->{h}));	2567	$self->{other}->move ($self->coord2global (0, $self->{h}));
2306	$self->emit ("open");	2568	$self->_emit ("open");
2307	} else {	2569	} else {
2308	$CFClient::UI::ROOT->remove ($self->{other});	2570	$CFClient::UI::ROOT->remove ($self->{other});
2309	$self->emit ("close");	2571	$self->_emit ("close");
2310	}	2572	}
2311		2573
2312	$self->emit (changed => $self->{state});	2574	$self->_emit (changed => $self->{state});
2313	}	2575	}
2314		2576
2315	#############################################################################	2577	#############################################################################
2316		2578
2317	package CFClient::UI::Tooltip;	2579	package CFClient::UI::Tooltip;
…		…
2331		2593
2332	sub set_tooltip_from {	2594	sub set_tooltip_from {
2333	my ($self, $widget) = @_;	2595	my ($self, $widget) = @_;
2334		2596
2335	$self->add (new CFClient::UI::Label	2597	$self->add (new CFClient::UI::Label
2336	markup => $widget->{tooltip},	2598	markup => $widget->{tooltip},
2337	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2599	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338	fontsize => 0.8,	2600	fontsize => 0.8,
2339	fg => [0, 0, 0, 1],	2601	fg => [0, 0, 0, 1],
		2602	ellipsise => 0,
2340	font => ($widget->{tooltip_font} || $::FONT_PROP),	2603	font => ($widget->{tooltip_font} || $::FONT_PROP),
2341	);	2604	);
2342	}	2605	}
2343		2606
2344	sub size_request {	2607	sub size_request {
2345	my ($self) = @_;	2608	my ($self) = @_;
…		…
2391	use CFClient::OpenGL;	2654	use CFClient::OpenGL;
2392		2655
2393	sub new {	2656	sub new {
2394	my $class = shift;	2657	my $class = shift;
2395		2658
2396	$class->SUPER::new (	2659	my $self = $class->SUPER::new (
2397	aspect => 1,	2660	aspect => 1,
		2661	can_events => 0,
2398	@_,	2662	@_,
2399	)	2663	);
		2664
		2665	if ($self->{anim} && $self->{animspeed}) {
		2666	Scalar::Util::weaken (my $widget = $self);
		2667
		2668	$self->{timer} = Event->timer (
		2669	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2670	hard => 1,
		2671	interval => $self->{animspeed},
		2672	cb => sub {
		2673	++$widget->{frame};
		2674	$widget->update;
		2675	},
		2676	);
		2677	}
		2678
		2679	$self
2400	}	2680	}
2401		2681
2402	sub size_request {	2682	sub size_request {
2403	(32, 8)	2683	(32, 8)
2404	}	2684	}
2405		2685
		2686	sub update {
		2687	my ($self) = @_;
		2688
		2689	return unless $self->{visible};
		2690
		2691	$self->SUPER::update;
		2692	}
		2693
2406	sub _draw {	2694	sub _draw {
2407	my ($self) = @_;	2695	my ($self) = @_;
2408		2696
2409	return unless $::CONN;#d# manage and cache textures differently	2697	return unless $::CONN;
		2698
		2699	my $face;
		2700
		2701	if ($self->{frame}) {
		2702	my $anim = $::CONN->{anim}[$self->{anim}];
		2703
		2704	$face = $anim->[ $self->{frame} % @$anim ]
		2705	if $anim && @$anim;
		2706	}
		2707
2410	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2708	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411		2709
2412	# TODO animation
2413	if ($tex) {	2710	if ($tex) {
2414	glEnable GL_TEXTURE_2D;	2711	glEnable GL_TEXTURE_2D;
2415	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2712	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416	glColor 1, 1, 1, 1;	2713	glColor 1, 1, 1, 1;
2417	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2714	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418	glDisable GL_TEXTURE_2D;	2715	glDisable GL_TEXTURE_2D;
2419	}	2716	}
2420	}	2717	}
2421		2718
		2719	sub DESTROY {
		2720	my ($self) = @_;
		2721
		2722	$self->{timer}->cancel
		2723	if $self->{timer};
		2724
		2725	$self->SUPER::DESTROY;
		2726	}
		2727
2422	#############################################################################	2728	#############################################################################
2423		2729
2424	package CFClient::UI::InventoryItem;	2730	package CFClient::UI::Inventory;
2425		2731
2426	our @ISA = CFClient::UI::HBox::;	2732	our @ISA = CFClient::UI::ScrolledWindow::;
2427		2733
2428	sub new {	2734	sub new {
2429	my $class = shift;	2735	my $class = shift;
2430		2736
2431	my %args = @_;
2432
2433	my $item = delete $args{item};
2434
2435	my $desc = $item->{nrof} < 2
2436	? $item->{name}
2437	: "$item->{nrof} $item->{name_pl}";
2438
2439
2440	my $self = $class->SUPER::new (	2737	my $self = $class->SUPER::new (
2441	can_hover => 1,	2738	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2442	can_events => 1,
2443	tooltip => (CFClient::UI::Label->escape ($desc)
2444	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445	connect_button_down => sub {
2446	my ($self, $ev, $x, $y) = @_;
2447
2448	# todo: maybe put examine on 1? but should just be a tooltip :(
2449	if ($ev->{button} == 1) {
2450	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2451	} elsif ($ev->{button} == 2) {
2452	$::CONN->send ("apply $item->{tag}");
2453	} elsif ($ev->{button} == 3) {
2454	CFClient::UI::Menu->new (
2455	items => [
2456	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457	[
2458	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459	sub { $::CONN->send ("lock $item->{tag}") },
2460	],
2461	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2462	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2463	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2464	],
2465	)->popup ($ev);
2466	}
2467
2468	1
2469	},
2470	%args
2471	);
2472
2473	$self->add (new CFClient::UI::Face
2474	can_events => 0,
2475	face => $item->{face},
2476	anim => $item->{anim},
2477	animspeed => $item->{animspeed},
2478	);
2479
2480	$self->add (new CFClient::UI::Label
2481	can_events => 0,
2482	text => $desc,
2483	);
2484
2485	$self
2486	}
2487
2488	#############################################################################
2489
2490	package CFClient::UI::Inventory;
2491
2492	our @ISA = CFClient::UI::ScrolledWindow::;
2493
2494	sub new {
2495	my $class = shift;
2496
2497	my $self = $class->SUPER::new (
2498	scrolled => (new CFClient::UI::VBox),
2499	@_,	2739	@_,
2500	);	2740	);
2501		2741
2502	$self	2742	$self
2503	}	2743	}
…		…
2506	my ($self, $items) = @_;	2746	my ($self, $items) = @_;
2507		2747
2508	$self->{scrolled}->clear;	2748	$self->{scrolled}->clear;
2509	return unless $items;	2749	return unless $items;
2510		2750
2511	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2751	my @items = sort {
		2752	($a->{type} <=> $b->{type})
		2753	or ($a->{name} cmp $b->{name})
		2754	} @$items;
2512		2755
2513	$self->{real_items} = \@items;	2756	$self->{real_items} = \@items;
2514		2757
		2758	my $row = 0;
2515	for my $item (@items) {	2759	for my $item (@items) {
2516	my $desc = $item->{nrof} < 2	2760	CFClient::Item::update_widgets $item;
2517	? $item->{name}
2518	: "$item->{nrof} $item->{name_pl}";
2519		2761
2520	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2762	$self->{scrolled}->add (0, $row, $item->{face_widget});
2521	}	2763	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2764	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2522		2765
2523	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2766	$row++;
		2767	}
2524	}	2768	}
2525		2769
2526	sub size_request {	2770	sub size_request {
2527	my ($self) = @_;	2771	my ($self) = @_;
2528	($self->{req_w}, $self->{req_h});	2772	($self->{req_w}, $self->{req_h});
…		…
2568		2812
2569	# popup given the event (must be a mouse button down event currently)	2813	# popup given the event (must be a mouse button down event currently)
2570	sub popup {	2814	sub popup {
2571	my ($self, $ev) = @_;	2815	my ($self, $ev) = @_;
2572		2816
2573	$self->emit ("popdown");	2817	$self->_emit ("popdown");
2574		2818
2575	# maybe save $GRAB? must be careful about events...	2819	# maybe save $GRAB? must be careful about events...
2576	$GRAB = $self;	2820	$GRAB = $self;
2577	$self->{button} = $ev->{button};	2821	$self->{button} = $ev->{button};
2578		2822
…		…
2593		2837
2594	if ($ev->{button} == $self->{button}) {	2838	if ($ev->{button} == $self->{button}) {
2595	undef $GRAB;	2839	undef $GRAB;
2596	$self->hide;	2840	$self->hide;
2597		2841
2598	$self->emit ("popdown");	2842	$self->_emit ("popdown");
2599	$self->{hover}[1]->() if $self->{hover};	2843	$self->{hover}[1]->() if $self->{hover};
2600	}	2844	}
2601	}	2845	}
2602		2846
2603	#############################################################################	2847	#############################################################################
2604		2848
2605	package CFClient::UI::Statusbox;	2849	package CFClient::UI::Statusbox;
2606		2850
2607	our @ISA = CFClient::UI::VBox::;	2851	our @ISA = CFClient::UI::VBox::;
		2852
		2853	sub new {
		2854	my $class = shift;
		2855
		2856	$class->SUPER::new (
		2857	fontsize => 0.8,
		2858	@_,
		2859	)
		2860	}
2608		2861
2609	sub reorder {	2862	sub reorder {
2610	my ($self) = @_;	2863	my ($self) = @_;
2611	my $NOW = time;	2864	my $NOW = time;
2612		2865
…		…
2631	? "<b>$item->{count} ×</b> $item->{text}"	2884	? "<b>$item->{count} ×</b> $item->{text}"
2632	: $item->{text};	2885	: $item->{text};
2633		2886
2634	for ($short) {	2887	for ($short) {
2635	s/^\s+//;	2888	s/^\s+//;
2636	s/\012.*/…/s;	2889	s/\s+/ /g;
2637	my $len = int 30 / $item->{fontsize};
2638	substr $_, $len, length, "…" if $len < length;
2639	}	2890	}
2640		2891
2641	new CFClient::UI::Label	2892	new CFClient::UI::Label
2642	markup => $short,	2893	markup => $short,
2643	tooltip => $item->{tooltip},	2894	tooltip => $item->{tooltip},
2644	tooltip_font => $::FONT_PROP,	2895	tooltip_font => $::FONT_PROP,
2645	tooltip_width => 0.67,	2896	tooltip_width => 0.67,
2646	fontsize => $item->{fontsize},	2897	fontsize => $item->{fontsize} || $self->{fontsize},
		2898	max_w => $::WIDTH * 0.44,
2647	color => $item->{color},	2899	fg => $item->{fg},
2648	can_events => 1,	2900	can_events => 1,
2649	can_hover => 1	2901	can_hover => 1
2650	};	2902	};
2651	}	2903	}
2652		2904
…		…
2654	$self->SUPER::add (reverse @widgets);	2906	$self->SUPER::add (reverse @widgets);
2655	}	2907	}
2656		2908
2657	sub add {	2909	sub add {
2658	my ($self, $text, %arg) = @_;	2910	my ($self, $text, %arg) = @_;
		2911
		2912	$text =~ s/^\s+//;
		2913	$text =~ s/\s+$//;
		2914
		2915	return unless $text;
2659		2916
2660	my $timeout = time + ((delete $arg{timeout}) || 60);	2917	my $timeout = time + ((delete $arg{timeout}) || 60);
2661		2918
2662	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2919	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663		2920
…		…
2666	$item->{count}++;	2923	$item->{count}++;
2667	} else {	2924	} else {
2668	$item->{count} = 1;	2925	$item->{count} = 1;
2669	$item->{text} = $item->{tooltip} = $text;	2926	$item->{text} = $item->{tooltip} = $text;
2670	}	2927	}
		2928	$item->{id} = ++$self->{id};
2671	$item->{timeout} = $timeout;	2929	$item->{timeout} = $timeout;
2672	delete $item->{label};	2930	delete $item->{label};
2673	} else {	2931	} else {
2674	$self->{item}{$group} = {	2932	$self->{item}{$group} = {
2675	id => ++$self->{id},	2933	id => ++$self->{id},
2676	text => $text,	2934	text => $text,
2677	timeout => $timeout,	2935	timeout => $timeout,
2678	tooltip => $text,	2936	tooltip => $text,
2679	fontsize => 0.8,
2680	color => [0.8, 0.8, 0.8, 0.8],	2937	fg => [0.8, 0.8, 0.8, 0.8],
2681	pri => 0,	2938	pri => 0,
2682	count => 1,	2939	count => 1,
2683	%arg,	2940	%arg,
2684	};	2941	};
2685	}	2942	}
2686		2943
2687	$self->reorder;	2944	$self->reorder;
2688	}	2945	}
2689		2946
		2947	sub reconfigure {
		2948	my ($self) = @_;
		2949
		2950	delete $_->{label}
		2951	for values %{ $self->{item} || {} };
		2952
		2953	$self->reorder;
		2954	$self->SUPER::reconfigure;
		2955	}
		2956
2690	#############################################################################	2957	#############################################################################
2691		2958
2692	package CFClient::UI::Root;	2959	package CFClient::UI::Root;
2693		2960
2694	our @ISA = CFClient::UI::Container::;	2961	our @ISA = CFClient::UI::Container::;
…		…
2724	}	2991	}
2725		2992
2726	sub size_allocate {	2993	sub size_allocate {
2727	my ($self, $w, $h) = @_;	2994	my ($self, $w, $h) = @_;
2728		2995
2729	my $old_w = $self->{old_w};
2730	my $old_h = $self->{old_h};
2731
2732	if ($old_w && $old_h) {
2733	for my $child ($self->children) {
2734	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742	}
2743	}
2744
2745	for my $child ($self->children) {	2996	for my $child ($self->children) {
2746	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2997	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2747		2998
		2999	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3000	if exists $child->{req_x};
		3001
		3002	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3003	if exists $child->{req_y};
		3004
2748	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3005	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2749	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3006	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3007
2750	$child->configure ($X, $Y, $W, $H);	3008	$child->configure ($X, $Y, $W, $H);
2751	}	3009	}
2752
2753	$self->{old_w} = $w;
2754	$self->{old_h} = $h;
2755	}	3010	}
2756		3011
2757	sub coord2local {	3012	sub coord2local {
2758	my ($self, $x, $y) = @_;	3013	my ($self, $x, $y) = @_;
2759		3014
…		…
2772	$self->check_size;	3027	$self->check_size;
2773	$::WANT_REFRESH++;	3028	$::WANT_REFRESH++;
2774	}	3029	}
2775		3030
2776	sub add {	3031	sub add {
2777	my ($self, $child) = @_;	3032	my ($self, @children) = @_;
2778		3033
		3034	for (my @widgets = @children; my $w = pop @widgets; ) {
		3035	push @widgets, $w->children;
		3036	$w->{root} = $self;
		3037	$w->{visible} = 1;
		3038	}
		3039
		3040	for my $child (@children) {
		3041	$child->{is_toplevel} = 1;
		3042
2779	# integerise window positions	3043	# integerise window positions
2780	$child->{x} = int $child->{x};	3044	$child->{x} = int $child->{x};
2781	$child->{y} = int $child->{y};	3045	$child->{y} = int $child->{y};
		3046	}
2782		3047
2783	$self->SUPER::add ($child);	3048	$self->SUPER::add (@children);
		3049	}
		3050
		3051	sub remove {
		3052	my ($self, @children) = @_;
		3053
		3054	$self->SUPER::remove (@children);
		3055
		3056	while (@children) {
		3057	my $w = pop @children;
		3058	push @children, $w->children;
		3059	$w->set_invisible;
		3060	}
2784	}	3061	}
2785		3062
2786	sub on_refresh {	3063	sub on_refresh {
2787	my ($self, $id, $cb) = @_;	3064	my ($self, $id, $cb) = @_;
2788		3065
2789	$self->{refresh_hook}{$id} = $cb;	3066	$self->{refresh_hook}{$id} = $cb;
2790	}	3067	}
2791		3068
		3069	sub on_post_alloc {
		3070	my ($self, $id, $cb) = @_;
		3071
		3072	$self->{post_alloc_hook}{$id} = $cb;
		3073	}
		3074
2792	sub draw {	3075	sub draw {
2793	my ($self) = @_;	3076	my ($self) = @_;
		3077
		3078	while ($self->{refresh_hook}) {
		3079	$_->()
		3080	for values %{delete $self->{refresh_hook}};
		3081	}
2794		3082
2795	if ($self->{check_size}) {	3083	if ($self->{check_size}) {
2796	my @queue = ([], []);	3084	my @queue = ([], []);
2797		3085
2798	for (;;) {	3086	for (;;) {
…		…
2830	$w = 0 if $w < 0;	3118	$w = 0 if $w < 0;
2831	$h = 0 if $h < 0;	3119	$h = 0 if $h < 0;
2832		3120
2833	$widget->{w} = $w;	3121	$widget->{w} = $w;
2834	$widget->{h} = $h;	3122	$widget->{h} = $h;
2835	$widget->size_allocate ($w, $h);
2836	$widget->emit (size_allocate => $w, $h);	3123	$widget->emit (size_allocate => $w, $h);
2837	}	3124	}
2838	}	3125	}
2839		3126
2840	while ($self->{refresh_hook}) {	3127	while ($self->{post_alloc_hook}) {
2841	$_->()	3128	$_->()
2842	for values %{delete $self->{refresh_hook}};	3129	for values %{delete $self->{post_alloc_hook}};
2843	}	3130	}
2844		3131
2845	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3132	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3133	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847	glClear GL_COLOR_BUFFER_BIT;	3134	glClear GL_COLOR_BUFFER_BIT;
2848		3135
2849	glMatrixMode GL_PROJECTION;	3136	glMatrixMode GL_PROJECTION;
2850	glLoadIdentity;	3137	glLoadIdentity;
2851	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3138	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852	glMatrixMode GL_MODELVIEW;	3139	glMatrixMode GL_MODELVIEW;
2853	glLoadIdentity;	3140	glLoadIdentity;
2854		3141
2855	$self->_draw;	3142	$self->_draw;
2856	}	3143	}
…		…
2858	#############################################################################	3145	#############################################################################
2859		3146
2860	package CFClient::UI;	3147	package CFClient::UI;
2861		3148
2862	$ROOT = new CFClient::UI::Root;	3149	$ROOT = new CFClient::UI::Root;
2863	$TOOLTIP = new CFClient::UI::Tooltip;	3150	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864		3151
2865	1	3152	1
2866		3153

Diff Legend

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