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

Diff Legend

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