ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.201 by root, Sat May 13 23:17:49 2006 UTC vs.
Revision 1.244 by root, Sat May 27 21:06:09 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
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
		18
		19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
16		38
17	sub check_tooltip {	39	sub check_tooltip {
18	if (!$GRAB) {	40	if (!$GRAB) {
19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
29	$TOOLTIP->set_tooltip_from ($widget);	51	$TOOLTIP->set_tooltip_from ($widget);
30	$TOOLTIP->show;	52	$TOOLTIP->show;
31		53
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		55
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	57	if $x + $TOOLTIP->{w} > $::WIDTH;
37		58
38	$TOOLTIP->move ($x, $y);	59	$TOOLTIP->move ($x, $y);
39	$TOOLTIP->check_size;	60	$TOOLTIP->check_size;
40	$TOOLTIP->update;	61	$TOOLTIP->update;
41	}	62	}
…		…
49	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
50	}	71	}
51		72
52	# class methods for events	73	# class methods for events
53	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
54	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
55	if $FOCUS;	76	if $FOCUS;
56	}	77	}
57		78
58	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
59	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
60	if $FOCUS;	81	if $FOCUS;
61	}	82	}
62		83
63	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
64	my ($ev) = @_;	85	my ($ev) = @_;
…		…
73	check_tooltip;	94	check_tooltip;
74	}	95	}
75		96
76	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
77		98
78	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
80	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81	}
82	}	101	}
83		102
84	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
85	my ($ev) = @_;	104	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
87		106
88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89		108
90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91		110
92	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
94	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95	}
96		113
97	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
98	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
99	$grab->update if $grab;	116	$grab->update if $grab;
100	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
116	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
117		134
118	check_tooltip;	135	check_tooltip;
119	}	136	}
120		137
121	if ($HOVER) {
122	($x, $y) = $HOVER->coord2local ($x, $y);
123	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124	}	139	if $HOVER;
125	}	140	}
126		141
127	# convert position array to integers	142	# convert position array to integers
128	sub harmonize {	143	sub harmonize {
129	my ($vals) = @_;	144	my ($vals) = @_;
…		…
133	for (@$vals) {	148	for (@$vals) {
134	my $i = int $_ + $rem;	149	my $i = int $_ + $rem;
135	$rem += $_ - $i;	150	$rem += $_ - $i;
136	$_ = $i;	151	$_ = $i;
137	}	152	}
		153	}
		154
		155	sub full_refresh {
		156	# make a copy, otherwise for complains about freed values.
		157	my @widgets = values %WIDGET;
		158
		159	$_->update
		160	for @widgets;
		161	}
		162
		163	sub reconfigure_widgets {
		164	# make a copy, otherwise C<for> complains about freed values.
		165	my @widgets = values %WIDGET;
		166
		167	$_->reconfigure
		168	for @widgets;
		169	}
		170
		171	# call when resolution changes etc.
		172	sub rescale_widgets {
		173	my ($sx, $sy) = @_;
		174
		175	for my $widget (values %WIDGET) {
		176	if ($widget->{is_toplevel}) {
		177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		180	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		181	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		183	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		184	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		185	}
		186	}
		187
		188	reconfigure_widgets;
138	}	189	}
139		190
140	#############################################################################	191	#############################################################################
141		192
142	package CFClient::UI::Base;	193	package CFClient::UI::Base;
…		…
155	can_events => 1,	206	can_events => 1,
156	@_	207	@_
157	}, $class;	208	}, $class;
158		209
159	for (keys %$self) {	210	for (keys %$self) {
160	if (/^connect_(.*)$/) {	211	if (/^on_(.*)$/) {
161	$self->connect ($1 => delete $self->{$_});	212	$self->connect ($1 => delete $self->{$_});
162	}	213	}
163	}	214	}
164		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
		218	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		219	$self->{user_x} = $layout->{x} * $::WIDTH;
		220	$self->{user_y} = $layout->{y} * $::HEIGHT;
		221	$self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		222	$self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		223	}
		224
165	$self	225	$self
166	}	226	}
167		227
168	sub destroy {	228	sub destroy {
169	my ($self) = @_;	229	my ($self) = @_;
…		…
172	%$self = ();	232	%$self = ();
173	}	233	}
174		234
175	sub show {	235	sub show {
176	my ($self) = @_;	236	my ($self) = @_;
177
178	return if $self->{parent};	237	return if $self->{parent};
179		238
180	$CFClient::UI::ROOT->add ($self);	239	$CFClient::UI::ROOT->add ($self);
181	}	240	}
182		241
183	sub hide {	242	sub show_centered {
184	my ($self) = @_;	243	my ($self) = @_;
		244	return if $self->{parent};
		245
		246	$self->show;
		247
		248	$CFClient::UI::ROOT->on_post_alloc (
		249	"centered $self" => sub {
		250	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		251	},
		252	);
		253	}
		254
		255	sub set_invisible {
		256	my ($self) = @_;
		257
		258	return unless $self->{visible};
		259
		260	# broken show/hide model
		261
		262	delete $self->{root};
		263	delete $self->{visible};
185		264
186	undef $GRAB if $GRAB == $self;	265	undef $GRAB if $GRAB == $self;
187	undef $HOVER if $HOVER == $self;	266	undef $HOVER if $HOVER == $self;
		267
		268	CFClient::UI::check_tooltip
		269	if $CFClient::UI::TOOLTIP->{owner} == $self;
		270
		271	$self->focus_out;
		272
		273	$self->emit (visibility_change => 0);
		274	}
		275
		276	sub hide {
		277	my ($self) = @_;
		278
		279	$self->set_invisible;
188		280
189	$self->{parent}->remove ($self)	281	$self->{parent}->remove ($self)
190	if $self->{parent};	282	if $self->{parent};
191	}	283	}
192		284
…		…
242		334
243	sub size_allocate {	335	sub size_allocate {
244	# nothing to be done	336	# nothing to be done
245	}	337	}
246		338
247	sub children {
248	}
249
250	# call when resolution changes etc.
251	sub reconfigure {	339	sub reconfigure {
252	my ($self) = @_;	340	my ($self) = @_;
253
254	$_->reconfigure
255	for $self->children;
256		341
257	$self->check_size (1);	342	$self->check_size (1);
258	$self->update;	343	$self->update;
259	}	344	}
260		345
		346	sub children {
		347	}
		348
261	sub set_max_size {	349	sub set_max_size {
262	my ($self, $w, $h) = @_;	350	my ($self, $w, $h) = @_;
263		351
264	delete $self->{max_w}; $self->{max_w} = $w if $w;	352	delete $self->{max_w}; $self->{max_w} = $w if $w;
265	delete $self->{max_h}; $self->{max_h} = $h if $h;	353	delete $self->{max_h}; $self->{max_h} = $h if $h;
		354	}
		355
		356	sub set_tooltip {
		357	my ($self, $tooltip) = @_;
		358
		359	$tooltip =~ s/^\s+//;
		360	$tooltip =~ s/\s+$//;
		361
		362	return if $self->{tooltip} eq $tooltip;
		363
		364	$self->{tooltip} = $tooltip;
		365
		366	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		367	delete $CFClient::UI::TOOLTIP->{owner};
		368	CFClient::UI::check_tooltip;
		369	}
266	}	370	}
267		371
268	# translate global coordinates to local coordinate system	372	# translate global coordinates to local coordinate system
269	sub coord2local {	373	sub coord2local {
270	my ($self, $x, $y) = @_;	374	my ($self, $x, $y) = @_;
…		…
285	return if $FOCUS == $self;	389	return if $FOCUS == $self;
286	return unless $self->{can_focus};	390	return unless $self->{can_focus};
287		391
288	my $focus = $FOCUS; $FOCUS = $self;	392	my $focus = $FOCUS; $FOCUS = $self;
289		393
290	$self->emit (focus_in => $focus);	394	$self->_emit (focus_in => $focus);
291		395
292	$focus->update if $focus;	396	$focus->update if $focus;
293	$FOCUS->update;	397	$FOCUS->update;
294	}	398	}
295		399
…		…
298		402
299	return unless $FOCUS == $self;	403	return unless $FOCUS == $self;
300		404
301	my $focus = $FOCUS; undef $FOCUS;	405	my $focus = $FOCUS; undef $FOCUS;
302		406
303	$self->emit (focus_out => $focus);	407	$self->_emit (focus_out => $focus);
304		408
305	$focus->update if $focus; #?	409	$focus->update if $focus; #?
		410
		411	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		412	unless $FOCUS;
306	}	413	}
307		414
308	sub mouse_motion { }	415	sub mouse_motion { }
309	sub button_up { }	416	sub button_up { }
310	sub key_down { }	417	sub key_down { }
311	sub key_up { }	418	sub key_up { }
312		419
313	sub button_down {	420	sub button_down {
314	my ($self, $ev, $x, $y) = @_;	421	my ($self, $ev, $x, $y) = @_;
315		422
316	$self->focus_in;	423	$self->focus_in;
…		…
350	if ($ENV{PCLIENT_DEBUG}) {	457	if ($ENV{PCLIENT_DEBUG}) {
351	glPushMatrix;	458	glPushMatrix;
352	glColor 1, 1, 0, 1;	459	glColor 1, 1, 0, 1;
353	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	460	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354	glBegin GL_LINE_LOOP;	461	glBegin GL_LINE_LOOP;
355	glVertex 0 , 0;	462	glVertex 0 , 0;
356	glVertex $self->{w}, 0;	463	glVertex $self->{w} - 1, 0;
357	glVertex $self->{w}, $self->{h};	464	glVertex $self->{w} - 1, $self->{h} - 1;
358	glVertex 0 , $self->{h};	465	glVertex 0 , $self->{h} - 1;
359	glEnd;	466	glEnd;
360	glPopMatrix;	467	glPopMatrix;
361	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	468	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362	}	469	}
363	}	470	}
364		471
365	sub _draw {	472	sub _draw {
366	my ($self) = @_;	473	my ($self) = @_;
…		…
383	sub set_parent {	490	sub set_parent {
384	my ($self, $parent) = @_;	491	my ($self, $parent) = @_;
385		492
386	Scalar::Util::weaken ($self->{parent} = $parent);	493	Scalar::Util::weaken ($self->{parent} = $parent);
387		494
		495	if ($parent->{visible} || 1) {
		496	$self->{root} = $parent->{root};
		497	$self->{visible} = $parent->{visible} + 1;
		498
		499	$self->emit (visibility_change => 1)
		500	unless $self->{parent}{visible};
		501	}
		502
388	# TODO: req_w _does_change after ->reconfigure	503	# TODO: req_w _does_change after ->reconfigure
389	$self->check_size	504	$self->check_size
390	unless exists $self->{req_w};	505	unless exists $self->{req_w};
		506
		507	$self->show;
391	}	508	}
392		509
393	sub check_size {	510	sub check_size {
394	my ($self, $forced) = @_;	511	my ($self, $forced) = @_;
395		512
…		…
408	my ($self, $signal, $cb) = @_;	525	my ($self, $signal, $cb) = @_;
409		526
410	push @{ $self->{signal_cb}{$signal} }, $cb;	527	push @{ $self->{signal_cb}{$signal} }, $cb;
411	}	528	}
412		529
		530	sub _emit {
		531	my ($self, $signal, @args) = @_;
		532
		533	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		534	}
		535
413	sub emit {	536	sub emit {
414	my ($self, $signal, @args) = @_;	537	my ($self, $signal, @args) = @_;
415		538
416	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	539	$self->_emit ($signal, @args)
		540	|| $self->$signal (@args);
		541	}
		542
		543	sub visibility_change {
		544	#my ($self, $visible) = @_;
417	}	545	}
418		546
419	sub DESTROY {	547	sub DESTROY {
420	my ($self) = @_;	548	my ($self) = @_;
421		549
		550	delete $WIDGET{$self+0};
422	#$self->deactivate;	551	#$self->deactivate;
423	}	552	}
424		553
425	#############################################################################	554	#############################################################################
426		555
…		…
435	my $class = shift;	564	my $class = shift;
436		565
437	# range [value, low, high, page]	566	# range [value, low, high, page]
438		567
439	$class->SUPER::new (	568	$class->SUPER::new (
440	bg => [0, 0, 0, 0.2],	569	#bg => [0, 0, 0, 0.2],
441	active_bg => [1, 1, 1, 0.5],	570	#active_bg => [1, 1, 1, 0.5],
442	@_	571	@_
443	)	572	)
444	}	573	}
445		574
446	sub _draw {	575	sub _draw {
447	my ($self) = @_;	576	my ($self) = @_;
448		577
		578	my $color = $FOCUS == $self && $self->{active_bg}
		579	? $self->{active_bg}
		580	: $self->{bg};
		581
		582	if ($color && (@$color < 4 || $color->[3])) {
449	my ($w, $h) = @$self{qw(w h)};	583	my ($w, $h) = @$self{qw(w h)};
450		584
451	glEnable GL_BLEND;	585	glEnable GL_BLEND;
452	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	586	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	587	glColor @$color;
454		588
455	glBegin GL_QUADS;	589	glBegin GL_QUADS;
456	glVertex 0 , 0;	590	glVertex 0 , 0;
457	glVertex 0 , $h;	591	glVertex 0 , $h;
458	glVertex $w, $h;	592	glVertex $w, $h;
459	glVertex $w, 0;	593	glVertex $w, 0;
460	glEnd;	594	glEnd;
461		595
462	glDisable GL_BLEND;	596	glDisable GL_BLEND;
		597	}
463	}	598	}
464		599
465	#############################################################################	600	#############################################################################
466		601
467	package CFClient::UI::Empty;	602	package CFClient::UI::Empty;
…		…
527	delete $child->{parent};	662	delete $child->{parent};
528	$child->hide;	663	$child->hide;
529		664
530	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	665	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531		666
532	$self->check_size;	667	$self->check_size (1);
533	$self->update;	668	$self->update;
534	}	669	}
535		670
536	sub clear {	671	sub clear {
537	my ($self) = @_;	672	my ($self) = @_;
…		…
651	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	786	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652	glClearColor 0, 0, 0, 0;	787	glClearColor 0, 0, 0, 0;
653	glClear GL_COLOR_BUFFER_BIT;	788	glClear GL_COLOR_BUFFER_BIT;
654		789
655	$self->_render;	790	$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	};	791	};
664	}	792	}
665		793
666	sub _draw {	794	sub _draw {
667	my ($self) = @_;	795	my ($self) = @_;
…		…
671	my $tex = $self->{texture}	799	my $tex = $self->{texture}
672	or return;	800	or return;
673		801
674	glEnable GL_TEXTURE_2D;	802	glEnable GL_TEXTURE_2D;
675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	803	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676	glColor 0, 0, 0, 1;	804	glColor 1, 1, 1, 1;
677		805
678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	806	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679		807
680	glDisable GL_TEXTURE_2D;	808	glDisable GL_TEXTURE_2D;
681	}	809	}
…		…
684		812
685	package CFClient::UI::ViewPort;	813	package CFClient::UI::ViewPort;
686		814
687	our @ISA = CFClient::UI::Window::;	815	our @ISA = CFClient::UI::Window::;
688		816
		817	sub new {
		818	my $class = shift;
		819
		820	$class->SUPER::new (
		821	scroll_x => 0,
		822	scroll_y => 1,
		823	@_,
		824	)
		825	}
		826
689	sub size_request {	827	sub size_request {
690	my ($self) = @_;	828	my ($self) = @_;
691		829
692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	830	@$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		831
695	@$self{qw(child_w child_h)}	832	@$self{qw(child_w child_h)}
696	}	833	}
697		834
698	sub size_allocate {	835	sub size_allocate {
699	my ($self, $w, $h) = @_;	836	my ($self, $w, $h) = @_;
700		837
		838	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		839	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		840
		841	$self->child->configure (0, 0, $w, $h);
701	$self->update;	842	$self->update;
702	}	843	}
703		844
704	sub set_offset {	845	sub set_offset {
705	my ($self, $x, $y) = @_;	846	my ($self, $x, $y) = @_;
…		…
756	my $class = shift;	897	my $class = shift;
757		898
758	my $self;	899	my $self;
759		900
760	my $slider = new CFClient::UI::Slider	901	my $slider = new CFClient::UI::Slider
761	vertical => 1,	902	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	903	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	904	on_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	905	$self->{vp}->set_offset (0, $_[1]);
765	},	906	},
766	;	907	;
767		908
768	$self = $class->SUPER::new (	909	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	910	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	911	slider => $slider,
771	@_,	912	@_,
772	);	913	);
773		914
774	$self->{vp}->add ($self->{scrolled});	915	$self->{vp}->add ($self->{scrolled});
775	$self->add ($self->{vp});	916	$self->add ($self->{vp});
776	$self->add ($self->{slider});	917	$self->add ($self->{slider});
777		918
778	$self	919	$self
		920	}
		921
		922	sub update {
		923	my ($self) = @_;
		924
		925	$self->SUPER::update;
		926
		927	# todo: overwrite size_allocate of child
		928	my $child = $self->{vp}->child;
		929	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		930	}
		931
		932	sub size_allocate {
		933	my ($self, $w, $h) = @_;
		934
		935	$self->SUPER::size_allocate ($w, $h);
		936
		937	my $child = $self->{vp}->child;
		938	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
779	}	939	}
780		940
781	#TODO# update range on size_allocate depending on child	941	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	942	# update viewport offset on scroll
783		943
…		…
837	my $class = shift;	997	my $class = shift;
838		998
839	# TODO: user_x, user_y, overwrite moveto?	999	# TODO: user_x, user_y, overwrite moveto?
840		1000
841	my $self = $class->SUPER::new (	1001	my $self = $class->SUPER::new (
842	bg => [1, 1, 1, 1],	1002	bg => [1, 1, 1, 1],
843	border_bg => [1, 1, 1, 1],	1003	border_bg => [1, 1, 1, 1],
844	border => 0.6,	1004	border => 0.6,
		1005	is_toplevel => 1,
845	can_events => 1,	1006	can_events => 1,
846	@_	1007	@_
847	);	1008	);
848		1009
849	$self->{title} &&= new CFClient::UI::Label	1010	$self->{title} &&= new CFClient::UI::Label
850	align => 0,	1011	align => 0,
…		…
874	my ($self, $w, $h) = @_;	1035	my ($self, $w, $h) = @_;
875		1036
876	$h -= List::Util::max 0, $self->border * 2;	1037	$h -= List::Util::max 0, $self->border * 2;
877	$w -= List::Util::max 0, $self->border * 2;	1038	$w -= List::Util::max 0, $self->border * 2;
878		1039
879	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1040	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
880	if $self->{title};	1041	if $self->{title};
881		1042
882	$self->child->configure ($self->border, $self->border, $w, $h);	1043	$self->child->configure ($self->border, $self->border, $w, $h);
883	}	1044	}
884		1045
…		…
903	my ($ev, $x, $y) = @_;	1064	my ($ev, $x, $y) = @_;
904		1065
905	my $dx = $ev->{x} - $ox;	1066	my $dx = $ev->{x} - $ox;
906	my $dy = $ev->{y} - $oy;	1067	my $dy = $ev->{y} - $oy;
907		1068
		1069	$self->{user_x} = $wx + $dx * $mx;
		1070	$self->{user_y} = $wy + $dy * $my;
908	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1071	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
909	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1072	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
910	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1073	$self->move ($self->{user_x}, $self->{user_y});
911	$self->check_size;	1074	$self->check_size;
912	};	1075	};
913		1076
914	} elsif ($lr ^ $td) {	1077	} elsif ($lr ^ $td) {
915	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1078	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
918	$self->{motion} = sub {	1081	$self->{motion} = sub {
919	my ($ev, $x, $y) = @_;	1082	my ($ev, $x, $y) = @_;
920		1083
921	($x, $y) = ($ev->{x}, $ev->{y});	1084	($x, $y) = ($ev->{x}, $ev->{y});
922		1085
923	$self->move ($bx + $x - $ox, $by + $y - $oy);	1086	$self->{user_x} = $bx + $x - $ox;
		1087	$self->{user_y} = $by + $y - $oy;
		1088	$self->move ($self->{user_x}, $self->{user_y});
924	$self->update;	1089	$self->update;
925	};	1090	};
926	}	1091	}
927	}	1092	}
928		1093
…		…
990	sub new {	1155	sub new {
991	my $class = shift;	1156	my $class = shift;
992		1157
993	$class->SUPER::new (	1158	$class->SUPER::new (
994	col_expand => [],	1159	col_expand => [],
995	@_	1160	@_,
996	)	1161	)
		1162	}
		1163
		1164	sub children {
		1165	grep $_, map @$_, grep $_, @{ $_[0]{children} }
997	}	1166	}
998		1167
999	sub add {	1168	sub add {
1000	my ($self, $x, $y, $child) = @_;	1169	my ($self, $x, $y, $child) = @_;
1001		1170
1002	$child->set_parent ($self);	1171	$child->set_parent ($self);
1003	$self->{children}[$y][$x] = $child;	1172	$self->{children}[$y][$x] = $child;
1004		1173
1005	$child->check_size;	1174	$self->check_size (1);
1006	}	1175	}
1007		1176
1008	sub children {
1009	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1010	}
1011
1012	# TODO: move to container class maybe? send childs a signal on removal?	1177	# TODO: move to container class maybe? send children a signal on removal?
1013	sub clear {	1178	sub clear {
1014	my ($self) = @_;	1179	my ($self) = @_;
1015		1180
1016	my @children = $self->children;	1181	my @children = $self->children;
1017	delete $self->{children};	1182	delete $self->{children};
…		…
1019	for (@children) {	1184	for (@children) {
1020	delete $_->{parent};	1185	delete $_->{parent};
1021	$_->hide;	1186	$_->hide;
1022	}	1187	}
1023		1188
		1189	$self->check_size (1);
1024	$self->update;	1190	$self->update;
1025	}	1191	}
1026		1192
1027	sub get_wh {	1193	sub get_wh {
1028	my ($self) = @_;	1194	my ($self) = @_;
…		…
1060	sub size_allocate {	1226	sub size_allocate {
1061	my ($self, $w, $h) = @_;	1227	my ($self, $w, $h) = @_;
1062		1228
1063	my ($ws, $hs) = $self->get_wh;	1229	my ($ws, $hs) = $self->get_wh;
1064		1230
1065	my $req_w = sum @$ws;	1231	my $req_w = (sum @$ws) || 1;
1066	my $req_h = sum @$hs;	1232	my $req_h = (sum @$hs) || 1;
1067		1233
1068	# TODO: nicer code && do row_expand	1234	# TODO: nicer code && do row_expand
1069	my @col_expand = @{$self->{col_expand}};	1235	my @col_expand = @{$self->{col_expand}};
1070	@col_expand = (1) x @$ws unless @col_expand;	1236	@col_expand = (1) x @$ws unless @col_expand;
1071	my $col_expand = (sum @col_expand) || 1;	1237	my $col_expand = (sum @col_expand) || 1;
…		…
1245		1411
1246	#############################################################################	1412	#############################################################################
1247		1413
1248	package CFClient::UI::Label;	1414	package CFClient::UI::Label;
1249		1415
1250	our @ISA = CFClient::UI::Base::;	1416	our @ISA = CFClient::UI::DrawBG::;
1251		1417
1252	use CFClient::OpenGL;	1418	use CFClient::OpenGL;
1253		1419
1254	sub new {	1420	sub new {
1255	my ($class, %arg) = @_;	1421	my ($class, %arg) = @_;
1256		1422
1257	my $self = $class->SUPER::new (	1423	my $self = $class->SUPER::new (
1258	fg => [1, 1, 1],	1424	fg => [1, 1, 1],
		1425	#bg => none
		1426	#active_bg => none
1259	#font => default_font	1427	#font => default_font
1260	#text => initial text	1428	#text => initial text
1261	#markup => initial narkup	1429	#markup => initial narkup
		1430	#max_w => maximum pixel width
		1431	ellipsise => 3, # end
1262	layout => (new CFClient::Layout),	1432	layout => (new CFClient::Layout),
1263	fontsize => 1,	1433	fontsize => 1,
1264	align => -1,	1434	align => -1,
1265	valign => -1,	1435	valign => -1,
1266	padding => 2,	1436	padding => 2,
…		…
1281	}	1451	}
1282		1452
1283	$self	1453	$self
1284	}	1454	}
1285		1455
1286	sub escape {	1456	sub escape($) {
1287	local $_ = $_[1];	1457	local $_ = $_[0];
1288		1458
1289	s/&/&amp;/g;	1459	s/&/&amp;/g;
1290	s/>/&gt;/g;	1460	s/>/&gt;/g;
1291	s/</&lt;/g;	1461	s/</&lt;/g;
1292		1462
1293	$_[1]	1463	$_
1294	}	1464	}
1295		1465
1296	sub update {	1466	sub update {
1297	my ($self) = @_;	1467	my ($self) = @_;
1298		1468
…		…
1331	sub size_request {	1501	sub size_request {
1332	my ($self) = @_;	1502	my ($self) = @_;
1333		1503
1334	$self->{layout}->set_font ($self->{font}) if $self->{font};	1504	$self->{layout}->set_font ($self->{font}) if $self->{font};
1335	$self->{layout}->set_width ($self->{max_w} || -1);	1505	$self->{layout}->set_width ($self->{max_w} || -1);
		1506	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1507	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1508	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337		1509
1338	my ($w, $h) = $self->{layout}->size;	1510	my ($w, $h) = $self->{layout}->size;
1339		1511
1340	if (exists $self->{template}) {	1512	if (exists $self->{template}) {
…		…
1370	}	1542	}
1371		1543
1372	sub _draw {	1544	sub _draw {
1373	my ($self) = @_;	1545	my ($self) = @_;
1374		1546
		1547	$self->SUPER::_draw; # draw background, if applicable
		1548
1375	my $tex = $self->{texture} ||= do {	1549	my $tex = $self->{texture} ||= do {
1376	$self->{layout}->set_foreground (@{$self->{fg}});	1550	$self->{layout}->set_foreground (@{$self->{fg}});
1377	$self->{layout}->set_font ($self->{font}) if $self->{font};	1551	$self->{layout}->set_font ($self->{font}) if $self->{font};
1378	$self->{layout}->set_width ($self->{w});	1552	$self->{layout}->set_width ($self->{w});
		1553	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1554	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1379	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1555	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380		1556
1381	my $tex = new_from_layout CFClient::Texture $self->{layout};	1557	my $tex = new_from_layout CFClient::Texture $self->{layout};
1382		1558
1383	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1559	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1384	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1560	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385	: ($self->{w} - $tex->{w}) * 0.5;	1561	: ($self->{w} - $tex->{w}) * 0.5);
1386		1562
1387	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1563	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1388	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1564	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389	: ($self->{h} - $tex->{h}) * 0.5;	1565	: ($self->{h} - $tex->{h}) * 0.5);
1390		1566
1391	$tex	1567	$tex
1392	};	1568	};
1393		1569
1394	glEnable GL_TEXTURE_2D;	1570	glEnable GL_TEXTURE_2D;
…		…
1422	active_fg => [0, 0, 0],	1598	active_fg => [0, 0, 0],
1423	can_hover => 1,	1599	can_hover => 1,
1424	can_focus => 1,	1600	can_focus => 1,
1425	valign => 0,	1601	valign => 0,
1426	can_events => 1,	1602	can_events => 1,
		1603	#text => ...
1427	@_	1604	@_
1428	)	1605	)
1429	}	1606	}
1430		1607
1431	sub _set_text {	1608	sub _set_text {
…		…
1441	$self->{text} = $text;	1618	$self->{text} = $text;
1442		1619
1443	$text =~ s/./*/g if $self->{hidden};	1620	$text =~ s/./*/g if $self->{hidden};
1444	$self->{layout}->set_text ("$text ");	1621	$self->{layout}->set_text ("$text ");
1445		1622
1446	$self->emit (changed => $self->{text});	1623	$self->_emit (changed => $self->{text});
1447	}	1624	}
1448		1625
1449	sub set_text {	1626	sub set_text {
1450	my ($self, $text) = @_;	1627	my ($self, $text) = @_;
1451		1628
1452	$self->{cursor} = length $text;	1629	$self->{cursor} = length $text;
1453	$self->_set_text ($text);	1630	$self->_set_text ($text);
		1631	$self->update;
1454	$self->check_size;	1632	$self->check_size;
1455	$self->update;
1456	}	1633	}
1457		1634
1458	sub get_text {	1635	sub get_text {
1459	$_[0]{text}	1636	$_[0]{text}
1460	}	1637	}
…		…
1463	my ($self) = @_;	1640	my ($self) = @_;
1464		1641
1465	my ($w, $h) = $self->SUPER::size_request;	1642	my ($w, $h) = $self->SUPER::size_request;
1466		1643
1467	($w + 1, $h) # add 1 for cursor	1644	($w + 1, $h) # add 1 for cursor
1468	}
1469
1470	sub size_allocate {
1471	my ($self, $w, $h) = @_;
1472
1473	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1474	}	1645	}
1475		1646
1476	sub key_down {	1647	sub key_down {
1477	my ($self, $ev) = @_;	1648	my ($self, $ev) = @_;
1478		1649
…		…
1493	} elsif ($sym == CFClient::SDLK_HOME) {	1664	} elsif ($sym == CFClient::SDLK_HOME) {
1494	$self->{cursor} = 0;	1665	$self->{cursor} = 0;
1495	} elsif ($sym == CFClient::SDLK_END) {	1666	} elsif ($sym == CFClient::SDLK_END) {
1496	$self->{cursor} = length $text;	1667	$self->{cursor} = length $text;
1497	} elsif ($uni == 27) {	1668	} elsif ($uni == 27) {
1498	$self->emit ('escape');	1669	$self->_emit ('escape');
1499	} elsif ($uni) {	1670	} elsif ($uni) {
1500	substr $text, $self->{cursor}++, 0, chr $uni;	1671	substr $text, $self->{cursor}++, 0, chr $uni;
1501	}	1672	}
1502		1673
1503	$self->_set_text ($text);	1674	$self->_set_text ($text);
1504	$self->update;	1675	$self->update;
		1676	$self->check_size;
1505	}	1677	}
1506		1678
1507	sub focus_in {	1679	sub focus_in {
1508	my ($self) = @_;	1680	my ($self) = @_;
1509		1681
…		…
1589	if ($sym == 13) {	1761	if ($sym == 13) {
1590	unshift @{$self->{history}},	1762	unshift @{$self->{history}},
1591	my $txt = $self->get_text;	1763	my $txt = $self->get_text;
1592	$self->{history_pointer} = -1;	1764	$self->{history_pointer} = -1;
1593	$self->{history_saveback} = '';	1765	$self->{history_saveback} = '';
1594	$self->emit (activate => $txt);	1766	$self->_emit (activate => $txt);
1595	$self->update;	1767	$self->update;
1596		1768
1597	} elsif ($sym == CFClient::SDLK_UP) {	1769	} elsif ($sym == CFClient::SDLK_UP) {
1598	if ($self->{history_pointer} < 0) {	1770	if ($self->{history_pointer} < 0) {
1599	$self->{history_saveback} = $self->get_text;	1771	$self->{history_saveback} = $self->get_text;
…		…
1638	my $class = shift;	1810	my $class = shift;
1639		1811
1640	$class->SUPER::new (	1812	$class->SUPER::new (
1641	padding => 4,	1813	padding => 4,
1642	fg => [1, 1, 1],	1814	fg => [1, 1, 1],
1643	bg => [1, 1, 1, 0.2],
1644	active_fg => [0, 0, 1],	1815	active_fg => [0, 0, 1],
1645	can_hover => 1,	1816	can_hover => 1,
1646	align => 0,	1817	align => 0,
1647	valign => 0,	1818	valign => 0,
1648	can_events => 1,	1819	can_events => 1,
1649	@_	1820	@_
1650	)	1821	)
1651	}	1822	}
1652		1823
		1824	sub activate { }
		1825
1653	sub button_up {	1826	sub button_up {
1654	my ($self, $ev, $x, $y) = @_;	1827	my ($self, $ev, $x, $y) = @_;
1655		1828
		1829	$self->emit ("activate")
1656	if ($x >= 0 && $x < $self->{w}	1830	if $x >= 0 && $x < $self->{w}
1657	&& $y >= 0 && $y < $self->{h}) {	1831	&& $y >= 0 && $y < $self->{h};
1658	$self->emit ("activate");
1659	}
1660	}	1832	}
1661		1833
1662	sub _draw {	1834	sub _draw {
1663	my ($self) = @_;	1835	my ($self) = @_;
1664		1836
…		…
1696		1868
1697	$class->SUPER::new (	1869	$class->SUPER::new (
1698	padding => 2,	1870	padding => 2,
1699	fg => [1, 1, 1],	1871	fg => [1, 1, 1],
1700	active_fg => [1, 1, 0],	1872	active_fg => [1, 1, 0],
		1873	bg => [0, 0, 0, 0.2],
		1874	active_bg => [1, 1, 1, 0.5],
1701	state => 0,	1875	state => 0,
1702	can_hover => 1,	1876	can_hover => 1,
1703	@_	1877	@_
1704	)	1878	)
1705	}	1879	}
…		…
1714	my ($self, $ev, $x, $y) = @_;	1888	my ($self, $ev, $x, $y) = @_;
1715		1889
1716	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1890	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1717	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1891	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1718	$self->{state} = !$self->{state};	1892	$self->{state} = !$self->{state};
1719	$self->emit (changed => $self->{state});	1893	$self->_emit (changed => $self->{state});
1720	}	1894	}
1721	}	1895	}
1722		1896
1723	sub _draw {	1897	sub _draw {
1724	my ($self) = @_;	1898	my ($self) = @_;
…		…
1989	qw(s1_slider.png s1_slider_bg.png);	2163	qw(s1_slider.png s1_slider_bg.png);
1990		2164
1991	sub new {	2165	sub new {
1992	my $class = shift;	2166	my $class = shift;
1993		2167
1994	# range [value, low, high, page]	2168	# range [value, low, high, page, unit]
1995		2169
1996	# TODO: 0-width page	2170	# TODO: 0-width page
1997	# TODO: req_w/h are wrong with vertical	2171	# TODO: req_w/h are wrong with vertical
1998	# TODO: calculations are off	2172	# TODO: calculations are off
1999	my $self = $class->SUPER::new (	2173	my $self = $class->SUPER::new (
2000	fg => [1, 1, 1],	2174	fg => [1, 1, 1],
2001	active_fg => [0, 0, 0],	2175	active_fg => [0, 0, 0],
		2176	bg => [0, 0, 0, 0.2],
		2177	active_bg => [1, 1, 1, 0.5],
2002	range => [0, 0, 100, 10],	2178	range => [0, 0, 100, 10, 0],
2003	req_w => $::WIDTH / 80,	2179	req_w => $::WIDTH / 80,
2004	req_h => $::WIDTH / 80,	2180	req_h => $::WIDTH / 80,
2005	vertical => 0,	2181	vertical => 0,
2006	can_hover => 1,	2182	can_hover => 1,
2007	inner_pad => 5,	2183	inner_pad => 0.02,
2008	@_	2184	@_
2009	);	2185	);
2010		2186
		2187	$self->set_value ($self->{range}[0]);
		2188	$self->update;
		2189
2011	$self	2190	$self
		2191	}
		2192
		2193	sub set_range {
		2194	my ($self, $range) = @_;
		2195
		2196	($range, $self->{range}) = ($self->{range}, $range);
		2197
		2198	$self->update
		2199	if "@$range" ne "@{$self->{range}}";
		2200	}
		2201
		2202	sub set_value {
		2203	my ($self, $value) = @_;
		2204
		2205	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2206
		2207	$hi = $lo + 1 if $hi <= $lo;
		2208
		2209	$page = $hi - $lo if $page > $hi - $lo;
		2210
		2211	$value = $lo if $value < $lo;
		2212	$value = $hi - $page if $value > $hi - $page;
		2213
		2214	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2215	if $unit;
		2216
		2217	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2218
		2219	if ($value != $old_value) {
		2220	$self->_emit (changed => $value);
		2221	$self->update;
		2222	}
2012	}	2223	}
2013		2224
2014	sub size_request {	2225	sub size_request {
2015	my ($self) = @_;	2226	my ($self) = @_;
2016		2227
…		…
2022		2233
2023	sub button_down {	2234	sub button_down {
2024	my ($self, $ev, $x, $y) = @_;	2235	my ($self, $ev, $x, $y) = @_;
2025		2236
2026	$self->SUPER::button_down ($ev, $x, $y);	2237	$self->SUPER::button_down ($ev, $x, $y);
		2238
		2239	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2240
2027	$self->mouse_motion ($ev, $x, $y);	2241	$self->mouse_motion ($ev, $x, $y);
2028	}	2242	}
2029		2243
2030	sub mouse_motion {	2244	sub mouse_motion {
2031	my ($self, $ev, $x, $y) = @_;	2245	my ($self, $ev, $x, $y) = @_;
2032		2246
2033	if ($GRAB == $self) {	2247	if ($GRAB == $self) {
		2248	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2249
		2250	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2251
		2252	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2253
		2254	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2255	}
		2256	}
		2257
		2258	sub update {
		2259	my ($self) = @_;
		2260
		2261	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2262	$self->set_value ($self->{range}[0]);
		2263
2034	my ($value, $lo, $hi, $page) = @{$self->{range}};	2264	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2265	my $range = ($hi - $page - $lo) || 1e-100;
2035		2266
2036	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2267	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2037		2268
2038	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2269	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2039	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2270	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2040		2271
2041	$x -= $inner_pad_px; # substract the padding	2272	$value = ($value - $lo) / $range;
2042	$x = $x * ($hi - $lo) / $inner_w + $lo;	2273	$value = $value * $self->{scale} + $self->{offset};
2043	$x = $lo if $x < $lo;
2044	$x = $hi - $page if $x > $hi - $page;
2045	$self->{range}[0] = $x;
2046		2274
2047	$self->emit (changed => $x);	2275	$self->{knob_x} = $value - $knob_w * 0.5;
2048	$self->update;	2276	$self->{knob_w} = $knob_w;
2049	}	2277	});
2050	}
2051		2278
2052	# the inner_* stuff is for generating a padding for the slider handle,	2279	$self->SUPER::update;
2053	# so that the handle doesn't leave the texture. This calculation isn't 100%
2054	# correct propably, but it does the job for now
2055	sub _calc_inner_pad_px {
2056	my ($self, $w) = @_;
2057	($w / 100) * $self->{inner_pad} # % to pixels
2058	}	2280	}
2059		2281
2060	sub _draw {	2282	sub _draw {
2061	my ($self) = @_;	2283	my ($self) = @_;
2062		2284
2063	$self->SUPER::_draw ();	2285	$self->SUPER::_draw ();
2064		2286
2065	my ($w, $h) = @$self{qw(w h)};	2287	glScale $self->{w}, $self->{h};
2066		2288
2067	if ($self->{vertical}) {	2289	if ($self->{vertical}) {
2068	# draw a vertical slider like a rotated horizontal slider	2290	# draw a vertical slider like a rotated horizontal slider
2069		2291
		2292	glTranslate 1, 0, 0;
2070	glRotate 90, 0, 0, 1;	2293	glRotate 90, 0, 0, 1;
2071	glTranslate 0, -$self->{w}, 0;
2072
2073	($w, $h) = ($h, $w);
2074	}	2294	}
2075		2295
2076	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2296	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2297	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078		2298
2079	my ($value, $lo, $hi, $page) = @{$self->{range}};
2080
2081	$hi = $value + 1 if $lo == $hi;
2082
2083	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2084	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2085
2086	$page = int $page * $inner_w / ($hi - $lo);
2087	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2088
2089	$w -= $page;
2090	$page &= ~1;
2091	glTranslate $page * 0.5, 0, 0;
2092	$page ||= 2;
2093
2094	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2095	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2096
2097	glEnable GL_TEXTURE_2D;	2299	glEnable GL_TEXTURE_2D;
2098	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2300	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099		2301
2100	# draw background	2302	# draw background
2101	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2303	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102		2304
2103	# draw handle	2305	# draw handle
2104	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2306	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2105		2307
2106	glDisable GL_TEXTURE_2D;	2308	glDisable GL_TEXTURE_2D;
2107	}	2309	}
		2310
		2311	#############################################################################
		2312
		2313	package CFClient::UI::ValSlider;
		2314
		2315	our @ISA = CFClient::UI::HBox::;
		2316
		2317	sub new {
		2318	my ($class, %arg) = @_;
		2319
		2320	my $range = delete $arg{range};
		2321
		2322	my $self = $class->SUPER::new (
		2323	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2324	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2325	to_value => sub { shift },
		2326	from_value => sub { shift },
		2327	%arg,
		2328	);
		2329
		2330	$self->{slider}->connect (changed => sub {
		2331	my ($self, $value) = @_;
		2332	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2333	$self->{parent}->emit (changed => $value);
		2334	});
		2335
		2336	# $self->{entry}->connect (changed => sub {
		2337	# my ($self, $value) = @_;
		2338	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2339	# $self->{parent}->emit (changed => $value);
		2340	# });
		2341
		2342	$self->add ($self->{slider}, $self->{entry});
		2343
		2344	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2345
		2346	$self
		2347	}
		2348
		2349	sub set_range { shift->{slider}->set_range (@_) }
		2350	sub set_value { shift->{slider}->set_value (@_) }
2108		2351
2109	#############################################################################	2352	#############################################################################
2110		2353
2111	package CFClient::UI::TextView;	2354	package CFClient::UI::TextView;
2112		2355
…		…
2142		2385
2143	$self->{fontsize} = $fontsize;	2386	$self->{fontsize} = $fontsize;
2144	$self->reflow;	2387	$self->reflow;
2145	}	2388	}
2146		2389
2147	sub text_height {
2148	my ($self, $text) = @_;
2149
2150	my $layout = $self->{layout};
2151
2152	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2153	$layout->set_width ($self->{children}[0]{w});
2154	$layout->set_markup ($text);
2155
2156	($layout->size)[1]
2157	}
2158
2159	sub reflow {
2160	my ($self) = @_;
2161
2162	$self->{need_reflow}++;
2163	$self->update;
2164	}
2165
2166	sub size_allocate {	2390	sub size_allocate {
2167	my ($self, $w, $h) = @_;	2391	my ($self, $w, $h) = @_;
2168		2392
2169	$self->SUPER::size_allocate ($w, $h);	2393	$self->SUPER::size_allocate ($w, $h);
2170		2394
…		…
2173	$self->{layout}->set_width ($self->{children}[0]{w});	2397	$self->{layout}->set_width ($self->{children}[0]{w});
2174		2398
2175	$self->reflow;	2399	$self->reflow;
2176	}	2400	}
2177		2401
		2402	sub text_size {
		2403	my ($self, $text, $indent) = @_;
		2404
		2405	my $layout = $self->{layout};
		2406
		2407	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2408	$layout->set_width ($self->{children}[0]{w} - $indent);
		2409	$layout->set_markup ($text);
		2410
		2411	$layout->size
		2412	}
		2413
		2414	sub reflow {
		2415	my ($self) = @_;
		2416
		2417	$self->{need_reflow}++;
		2418	$self->update;
		2419	}
		2420
		2421	sub set_offset {
		2422	my ($self, $offset) = @_;
		2423
		2424	# todo: base offset on lines or so, not on pixels
		2425	$self->{children}[1]->set_value ($offset);
		2426	}
		2427
		2428	sub clear {
		2429	my ($self) = @_;
		2430
		2431	$self->{par} = [];
		2432	$self->{height} = 0;
		2433	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2434	}
		2435
2178	sub add_paragraph {	2436	sub add_paragraph {
2179	my ($self, $color, $text) = @_;	2437	my ($self, $color, $text, $indent) = @_;
2180		2438
2181	#TODO: intelligently "reformat" paragraph	2439	for my $line (split /\n/, $text) {
2182		2440	my ($w, $h) = $self->text_size ($line);
2183	my $height = $self->text_height ($text);
2184
2185	$self->{height} += $height;	2441	$self->{height} += $h;
		2442	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2443	}
2186		2444
2187	push @{$self->{par}}, [$height, $color, $text];
2188
2189	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2445	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2190	$self->{children}[1]->update;
2191	}	2446	}
2192		2447
2193	sub update {	2448	sub update {
2194	my ($self) = @_;	2449	my ($self) = @_;
2195		2450
…		…
2198	return unless $self->{h} > 0;	2453	return unless $self->{h} > 0;
2199		2454
2200	delete $self->{texture};	2455	delete $self->{texture};
2201		2456
2202	$ROOT->on_post_alloc ($self, sub {	2457	$ROOT->on_post_alloc ($self, sub {
		2458	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2459
2203	if (delete $self->{need_reflow}) {	2460	if (delete $self->{need_reflow}) {
2204	my $height = 0;	2461	my $height = 0;
2205		2462
2206	$height += $_->[0] = $self->text_height ($_->[2])	2463	my $layout = $self->{layout};
		2464
		2465	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2466
2207	for @{$self->{par}};	2467	for (@{$self->{par}}) {
		2468	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2469	$layout->set_width ($W - $_->[3]);
		2470	$layout->set_markup ($_->[4]);
		2471	my ($w, $h) = $layout->size;
		2472	$_->[0] = $w + $_->[3];
		2473	$_->[1] = $h;
		2474	}
		2475
		2476	$height += $_->[1];
		2477	}
2208		2478
2209	$self->{height} = $height;	2479	$self->{height} = $height;
2210		2480
2211	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2481	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2212		2482
2213	delete $self->{texture};	2483	delete $self->{texture};
2214	}	2484	}
2215		2485
2216	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2486	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2217	glClearColor 0, 0, 0, 0;	2487	glClearColor 0.5, 0.5, 0.5, 0;
2218	glClear GL_COLOR_BUFFER_BIT;	2488	glClear GL_COLOR_BUFFER_BIT;
2219		2489
2220	glEnable GL_TEXTURE_2D;
2221	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222
2223	my $top = int $self->{children}[1]{range}[0];	2490	my $top = int $self->{children}[1]{range}[0];
2224		2491
2225	my $y0 = $top;	2492	my $y0 = $top;
2226	my $y1 = $top + $self->{h};	2493	my $y1 = $top + $H;
2227		2494
2228	my $y = 0;	2495	my $y = 0;
2229		2496
2230	my $layout = $self->{layout};	2497	my $layout = $self->{layout};
2231		2498
2232	$layout->set_font ($self->{font}) if $self->{font};	2499	$layout->set_font ($self->{font}) if $self->{font};
2233		2500
		2501	glEnable GL_BLEND;
		2502	#TODO# not correct in windows where rgba is forced off
		2503	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2504
2234	for my $par (@{$self->{par}}) {	2505	for my $par (@{$self->{par}}) {
2235	my $h = $par->[0];	2506	my $h = $par->[1];
2236		2507
2237	if ($y0 < $y + $h && $y < $y1) {	2508	if ($y0 < $y + $h && $y < $y1) {
2238	$layout->set_foreground (@{ $par->[1] });	2509	$layout->set_foreground (@{ $par->[2] });
		2510	$layout->set_width ($W - $par->[3]);
2239	$layout->set_markup ($par->[2]);	2511	$layout->set_markup ($par->[4]);
2240		2512
2241	my ($W, $H) = $layout->size;	2513	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2242	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2514
		2515	glRasterPos $par->[3], $y - $y0;
		2516	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2243	}	2517	}
2244		2518
2245	$y += $h;	2519	$y += $h;
2246	}	2520	}
2247		2521
2248	glDisable GL_TEXTURE_2D;	2522	glDisable GL_BLEND;
2249	};	2523	};
2250	});	2524	});
2251	}	2525	}
2252		2526
2253	sub _draw {	2527	sub _draw {
2254	my ($self) = @_;	2528	my ($self) = @_;
2255		2529
2256	glEnable GL_TEXTURE_2D;	2530	glEnable GL_TEXTURE_2D;
2257	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2531	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258	glColor 1, 1, 1, 1;	2532	glColor 1, 1, 1, 1;
2259	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2533	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2260	glDisable GL_TEXTURE_2D;	2534	glDisable GL_TEXTURE_2D;
2261		2535
2262	$self->{children}[1]->draw;	2536	$self->{children}[1]->draw;
2263		2537
2264	}	2538	}
…		…
2313		2587
2314	sub new {	2588	sub new {
2315	my $class = shift;	2589	my $class = shift;
2316		2590
2317	my $self = $class->SUPER::new (	2591	my $self = $class->SUPER::new (
2318	state => 0,	2592	state => 0,
2319	connect_activate => \&toggle_flopper,	2593	on_activate => \&toggle_flopper,
2320	@_	2594	@_
2321	);	2595	);
2322		2596
2323	if ($self->{state}) {	2597	if ($self->{state}) {
2324	$self->{state} = 0;	2598	$self->{state} = 0;
…		…
2333		2607
2334	# TODO: use animation	2608	# TODO: use animation
2335	if ($self->{state} = !$self->{state}) {	2609	if ($self->{state} = !$self->{state}) {
2336	$CFClient::UI::ROOT->add ($self->{other});	2610	$CFClient::UI::ROOT->add ($self->{other});
2337	$self->{other}->move ($self->coord2global (0, $self->{h}));	2611	$self->{other}->move ($self->coord2global (0, $self->{h}));
2338	$self->emit ("open");	2612	$self->_emit ("open");
2339	} else {	2613	} else {
2340	$CFClient::UI::ROOT->remove ($self->{other});	2614	$CFClient::UI::ROOT->remove ($self->{other});
2341	$self->emit ("close");	2615	$self->_emit ("close");
2342	}	2616	}
2343		2617
2344	$self->emit (changed => $self->{state});	2618	$self->_emit (changed => $self->{state});
2345	}	2619	}
2346		2620
2347	#############################################################################	2621	#############################################################################
2348		2622
2349	package CFClient::UI::Tooltip;	2623	package CFClient::UI::Tooltip;
…		…
2363		2637
2364	sub set_tooltip_from {	2638	sub set_tooltip_from {
2365	my ($self, $widget) = @_;	2639	my ($self, $widget) = @_;
2366		2640
2367	$self->add (new CFClient::UI::Label	2641	$self->add (new CFClient::UI::Label
2368	markup => $widget->{tooltip},	2642	markup => $widget->{tooltip},
2369	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2643	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370	fontsize => 0.8,	2644	fontsize => 0.8,
2371	fg => [0, 0, 0, 1],	2645	fg => [0, 0, 0, 1],
		2646	ellipsise => 0,
2372	font => ($widget->{tooltip_font} || $::FONT_PROP),	2647	font => ($widget->{tooltip_font} || $::FONT_PROP),
2373	);	2648	);
2374	}	2649	}
2375		2650
2376	sub size_request {	2651	sub size_request {
2377	my ($self) = @_;	2652	my ($self) = @_;
…		…
2423	use CFClient::OpenGL;	2698	use CFClient::OpenGL;
2424		2699
2425	sub new {	2700	sub new {
2426	my $class = shift;	2701	my $class = shift;
2427		2702
2428	$class->SUPER::new (	2703	my $self = $class->SUPER::new (
2429	aspect => 1,	2704	aspect => 1,
		2705	can_events => 0,
2430	@_,	2706	@_,
2431	)	2707	);
		2708
		2709	if ($self->{anim} && $self->{animspeed}) {
		2710	Scalar::Util::weaken (my $widget = $self);
		2711
		2712	$self->{timer} = Event->timer (
		2713	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2714	hard => 1,
		2715	interval => $self->{animspeed},
		2716	cb => sub {
		2717	++$widget->{frame};
		2718	$widget->update;
		2719	},
		2720	);
		2721	}
		2722
		2723	$self
2432	}	2724	}
2433		2725
2434	sub size_request {	2726	sub size_request {
2435	(32, 8)	2727	(32, 8)
2436	}	2728	}
2437		2729
		2730	sub update {
		2731	my ($self) = @_;
		2732
		2733	return unless $self->{visible};
		2734
		2735	$self->SUPER::update;
		2736	}
		2737
2438	sub _draw {	2738	sub _draw {
2439	my ($self) = @_;	2739	my ($self) = @_;
2440		2740
2441	return unless $::CONN;#d# manage and cache textures differently	2741	return unless $::CONN;
		2742
		2743	my $face;
		2744
		2745	if ($self->{frame}) {
		2746	my $anim = $::CONN->{anim}[$self->{anim}];
		2747
		2748	$face = $anim->[ $self->{frame} % @$anim ]
		2749	if $anim && @$anim;
		2750	}
		2751
2442	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2752	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2443		2753
2444	# TODO animation
2445	if ($tex) {	2754	if ($tex) {
2446	glEnable GL_TEXTURE_2D;	2755	glEnable GL_TEXTURE_2D;
2447	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2756	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448	glColor 1, 1, 1, 1;	2757	glColor 1, 1, 1, 1;
2449	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2758	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450	glDisable GL_TEXTURE_2D;	2759	glDisable GL_TEXTURE_2D;
2451	}	2760	}
2452	}	2761	}
2453		2762
		2763	sub DESTROY {
		2764	my ($self) = @_;
		2765
		2766	$self->{timer}->cancel
		2767	if $self->{timer};
		2768
		2769	$self->SUPER::DESTROY;
		2770	}
		2771
2454	#############################################################################	2772	#############################################################################
2455		2773
2456	package CFClient::UI::InventoryItem;	2774	package CFClient::UI::Inventory;
2457		2775
2458	our @ISA = CFClient::UI::HBox::;	2776	our @ISA = CFClient::UI::ScrolledWindow::;
2459		2777
2460	sub new {	2778	sub new {
2461	my $class = shift;	2779	my $class = shift;
2462		2780
2463	my %args = @_;
2464
2465	my $item = delete $args{item};
2466
2467	my $desc = $item->{nrof} < 2
2468	? $item->{name}
2469	: "$item->{nrof} $item->{name_pl}";
2470
2471
2472	my $self = $class->SUPER::new (	2781	my $self = $class->SUPER::new (
2473	can_hover => 1,	2782	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2474	can_events => 1,
2475	tooltip => (CFClient::UI::Label->escape ($desc)
2476	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477	connect_button_down => sub {
2478	my ($self, $ev, $x, $y) = @_;
2479
2480	# todo: maybe put examine on 1? but should just be a tooltip :(
2481	if ($ev->{button} == 1) {
2482	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483	} elsif ($ev->{button} == 2) {
2484	$::CONN->send ("apply $item->{tag}");
2485	} elsif ($ev->{button} == 3) {
2486	CFClient::UI::Menu->new (
2487	items => [
2488	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489	[
2490	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491	sub { $::CONN->send ("lock $item->{tag}") },
2492	],
2493	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496	],
2497	)->popup ($ev);
2498	}
2499
2500	1
2501	},
2502	%args
2503	);
2504
2505	$self->add (new CFClient::UI::Face
2506	can_events => 0,
2507	face => $item->{face},
2508	anim => $item->{anim},
2509	animspeed => $item->{animspeed},
2510	);
2511
2512	$self->add (new CFClient::UI::Label
2513	can_events => 0,
2514	text => $desc,
2515	);
2516
2517	$self
2518	}
2519
2520	#############################################################################
2521
2522	package CFClient::UI::Inventory;
2523
2524	our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526	sub new {
2527	my $class = shift;
2528
2529	my $self = $class->SUPER::new (
2530	scrolled => (new CFClient::UI::VBox),
2531	@_,	2783	@_,
2532	);	2784	);
2533		2785
2534	$self	2786	$self
2535	}	2787	}
…		…
2545	or ($a->{name} cmp $b->{name})	2797	or ($a->{name} cmp $b->{name})
2546	} @$items;	2798	} @$items;
2547		2799
2548	$self->{real_items} = \@items;	2800	$self->{real_items} = \@items;
2549		2801
		2802	my $row = 0;
2550	for my $item (@items) {	2803	for my $item (@items) {
2551	my $desc = $item->{nrof} < 2	2804	CFClient::Item::update_widgets $item;
2552	? $item->{name}
2553	: "$item->{nrof} $item->{name_pl}";
2554		2805
2555	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2806	$self->{scrolled}->add (0, $row, $item->{face_widget});
2556	}	2807	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2808	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2557		2809
2558	$self->{scrolled}->add (@items);	2810	$row++;
2559		2811	}
2560	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2561	}	2812	}
2562		2813
2563	sub size_request {	2814	sub size_request {
2564	my ($self) = @_;	2815	my ($self) = @_;
2565	($self->{req_w}, $self->{req_h});	2816	($self->{req_w}, $self->{req_h});
…		…
2605		2856
2606	# popup given the event (must be a mouse button down event currently)	2857	# popup given the event (must be a mouse button down event currently)
2607	sub popup {	2858	sub popup {
2608	my ($self, $ev) = @_;	2859	my ($self, $ev) = @_;
2609		2860
2610	$self->emit ("popdown");	2861	$self->_emit ("popdown");
2611		2862
2612	# maybe save $GRAB? must be careful about events...	2863	# maybe save $GRAB? must be careful about events...
2613	$GRAB = $self;	2864	$GRAB = $self;
2614	$self->{button} = $ev->{button};	2865	$self->{button} = $ev->{button};
2615		2866
…		…
2630		2881
2631	if ($ev->{button} == $self->{button}) {	2882	if ($ev->{button} == $self->{button}) {
2632	undef $GRAB;	2883	undef $GRAB;
2633	$self->hide;	2884	$self->hide;
2634		2885
2635	$self->emit ("popdown");	2886	$self->_emit ("popdown");
2636	$self->{hover}[1]->() if $self->{hover};	2887	$self->{hover}[1]->() if $self->{hover};
2637	}	2888	}
2638	}	2889	}
2639		2890
2640	#############################################################################	2891	#############################################################################
2641		2892
2642	package CFClient::UI::Statusbox;	2893	package CFClient::UI::Statusbox;
2643		2894
2644	our @ISA = CFClient::UI::VBox::;	2895	our @ISA = CFClient::UI::VBox::;
		2896
		2897	sub new {
		2898	my $class = shift;
		2899
		2900	$class->SUPER::new (
		2901	fontsize => 0.8,
		2902	@_,
		2903	)
		2904	}
2645		2905
2646	sub reorder {	2906	sub reorder {
2647	my ($self) = @_;	2907	my ($self) = @_;
2648	my $NOW = time;	2908	my $NOW = time;
2649		2909
…		…
2668	? "<b>$item->{count} ×</b> $item->{text}"	2928	? "<b>$item->{count} ×</b> $item->{text}"
2669	: $item->{text};	2929	: $item->{text};
2670		2930
2671	for ($short) {	2931	for ($short) {
2672	s/^\s+//;	2932	s/^\s+//;
2673	s/\012.*/…/s;	2933	s/\s+/ /g;
2674	my $len = int 40 / $item->{fontsize};
2675	substr $_, $len, length, "…" if $len < length;
2676	}	2934	}
2677		2935
2678	new CFClient::UI::Label	2936	new CFClient::UI::Label
2679	markup => $short,	2937	markup => $short,
2680	tooltip => $item->{tooltip},	2938	tooltip => $item->{tooltip},
2681	tooltip_font => $::FONT_PROP,	2939	tooltip_font => $::FONT_PROP,
2682	tooltip_width => 0.67,	2940	tooltip_width => 0.67,
2683	fontsize => $item->{fontsize},	2941	fontsize => $item->{fontsize} || $self->{fontsize},
		2942	max_w => $::WIDTH * 0.44,
2684	color => $item->{color},	2943	fg => $item->{fg},
2685	can_events => 1,	2944	can_events => 1,
2686	can_hover => 1	2945	can_hover => 1
2687	};	2946	};
2688	}	2947	}
2689		2948
…		…
2694	sub add {	2953	sub add {
2695	my ($self, $text, %arg) = @_;	2954	my ($self, $text, %arg) = @_;
2696		2955
2697	$text =~ s/^\s+//;	2956	$text =~ s/^\s+//;
2698	$text =~ s/\s+$//;	2957	$text =~ s/\s+$//;
		2958
		2959	return unless $text;
2699		2960
2700	my $timeout = time + ((delete $arg{timeout}) || 60);	2961	my $timeout = time + ((delete $arg{timeout}) || 60);
2701		2962
2702	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2963	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2703		2964
…		…
2715	$self->{item}{$group} = {	2976	$self->{item}{$group} = {
2716	id => ++$self->{id},	2977	id => ++$self->{id},
2717	text => $text,	2978	text => $text,
2718	timeout => $timeout,	2979	timeout => $timeout,
2719	tooltip => $text,	2980	tooltip => $text,
2720	fontsize => 0.8,
2721	color => [0.8, 0.8, 0.8, 0.8],	2981	fg => [0.8, 0.8, 0.8, 0.8],
2722	pri => 0,	2982	pri => 0,
2723	count => 1,	2983	count => 1,
2724	%arg,	2984	%arg,
2725	};	2985	};
2726	}	2986	}
2727		2987
2728	$self->reorder;	2988	$self->reorder;
2729	}	2989	}
2730		2990
		2991	sub reconfigure {
		2992	my ($self) = @_;
		2993
		2994	delete $_->{label}
		2995	for values %{ $self->{item} || {} };
		2996
		2997	$self->reorder;
		2998	$self->SUPER::reconfigure;
		2999	}
		3000
2731	#############################################################################	3001	#############################################################################
2732		3002
2733	package CFClient::UI::Root;	3003	package CFClient::UI::Root;
2734		3004
2735	our @ISA = CFClient::UI::Container::;	3005	our @ISA = CFClient::UI::Container::;
…		…
2738		3008
2739	sub new {	3009	sub new {
2740	my $class = shift;	3010	my $class = shift;
2741		3011
2742	$class->SUPER::new (	3012	$class->SUPER::new (
		3013	visible => 1,
2743	@_,	3014	@_,
2744	)	3015	)
2745	}	3016	}
2746		3017
2747	sub configure {	3018	sub configure {
…		…
2765	}	3036	}
2766		3037
2767	sub size_allocate {	3038	sub size_allocate {
2768	my ($self, $w, $h) = @_;	3039	my ($self, $w, $h) = @_;
2769		3040
2770	my $old_w = $self->{old_w};
2771	my $old_h = $self->{old_h};
2772
2773	if ($old_w && $old_h) {
2774	for my $child ($self->children) {
2775	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2776	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2777	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2778	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2779	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2780	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2781	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2782	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2783	}
2784	}
2785
2786	for my $child ($self->children) {	3041	for my $child ($self->children) {
2787	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3042	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2788		3043
		3044	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3045	if exists $child->{req_x};
		3046
		3047	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3048	if exists $child->{req_y};
		3049
		3050	$X = $self->{user_x} if exists $self->{user_x};
		3051	$Y = $self->{user_y} if exists $self->{user_y};
		3052
2789	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3053	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2790	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3054	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3055
2791	$child->configure ($X, $Y, $W, $H);	3056	$child->configure ($X, $Y, $W, $H);
2792	}	3057	}
2793
2794	$self->{old_w} = $w;
2795	$self->{old_h} = $h;
2796	}	3058	}
2797		3059
2798	sub coord2local {	3060	sub coord2local {
2799	my ($self, $x, $y) = @_;	3061	my ($self, $x, $y) = @_;
2800		3062
…		…
2813	$self->check_size;	3075	$self->check_size;
2814	$::WANT_REFRESH++;	3076	$::WANT_REFRESH++;
2815	}	3077	}
2816		3078
2817	sub add {	3079	sub add {
2818	my ($self, $child) = @_;	3080	my ($self, @children) = @_;
2819		3081
		3082	for (my @widgets = @children; my $w = pop @widgets; ) {
		3083	push @widgets, $w->children;
		3084	$w->{root} = $self;
		3085	$w->{visible} = $self->{visible} + 1;
		3086	}
		3087
		3088	for my $child (@children) {
		3089	$child->{is_toplevel} = 1;
		3090
2820	# integerise window positions	3091	# integerise window positions
2821	$child->{x} = int $child->{x};	3092	$child->{x} = int $child->{x};
2822	$child->{y} = int $child->{y};	3093	$child->{y} = int $child->{y};
		3094	}
2823		3095
2824	$self->SUPER::add ($child);	3096	$self->SUPER::add (@children);
		3097	}
		3098
		3099	sub remove {
		3100	my ($self, @children) = @_;
		3101
		3102	$self->SUPER::remove (@children);
		3103
		3104	while (@children) {
		3105	my $w = pop @children;
		3106	push @children, $w->children;
		3107	$w->set_invisible;
		3108	}
2825	}	3109	}
2826		3110
2827	sub on_refresh {	3111	sub on_refresh {
2828	my ($self, $id, $cb) = @_;	3112	my ($self, $id, $cb) = @_;
2829		3113
…		…
2843	$_->()	3127	$_->()
2844	for values %{delete $self->{refresh_hook}};	3128	for values %{delete $self->{refresh_hook}};
2845	}	3129	}
2846		3130
2847	if ($self->{check_size}) {	3131	if ($self->{check_size}) {
2848	my @queue = ([], []);	3132	my @queue;
2849		3133
2850	for (;;) {	3134	for (;;) {
2851	if ($self->{check_size}) {	3135	if ($self->{check_size}) {
2852	# heuristic: check containers last	3136	#TODO use array-of-depth approach
2853	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3137
		3138	@queue = sort { $a->{visible} <=> $b->{visible} }
2854	for values %{delete $self->{check_size}}	3139	@queue, values %{delete $self->{check_size}};
2855	}	3140	}
2856		3141
2857	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3142	my $widget = pop @queue || last;
		3143
		3144	defined $widget->{visible} or last; # do not resize invisible widgets
2858		3145
2859	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3146	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2860	? @$widget{qw(user_w user_h)}	3147	? @$widget{qw(user_w user_h)}
2861	: $widget->size_request;	3148	: $widget->size_request;
2862		3149
…		…
2882	$w = 0 if $w < 0;	3169	$w = 0 if $w < 0;
2883	$h = 0 if $h < 0;	3170	$h = 0 if $h < 0;
2884		3171
2885	$widget->{w} = $w;	3172	$widget->{w} = $w;
2886	$widget->{h} = $h;	3173	$widget->{h} = $h;
2887	$widget->size_allocate ($w, $h);
2888	$widget->emit (size_allocate => $w, $h);	3174	$widget->emit (size_allocate => $w, $h);
2889	}	3175	}
2890	}	3176	}
2891		3177
2892	while ($self->{post_alloc_hook}) {	3178	while ($self->{post_alloc_hook}) {
…		…
2898	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3184	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2899	glClear GL_COLOR_BUFFER_BIT;	3185	glClear GL_COLOR_BUFFER_BIT;
2900		3186
2901	glMatrixMode GL_PROJECTION;	3187	glMatrixMode GL_PROJECTION;
2902	glLoadIdentity;	3188	glLoadIdentity;
2903	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3189	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2904	glMatrixMode GL_MODELVIEW;	3190	glMatrixMode GL_MODELVIEW;
2905	glLoadIdentity;	3191	glLoadIdentity;
2906		3192
2907	$self->_draw;	3193	$self->_draw;
2908	}	3194	}
…		…
2910	#############################################################################	3196	#############################################################################
2911		3197
2912	package CFClient::UI;	3198	package CFClient::UI;
2913		3199
2914	$ROOT = new CFClient::UI::Root;	3200	$ROOT = new CFClient::UI::Root;
2915	$TOOLTIP = new CFClient::UI::Tooltip;	3201	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2916		3202
2917	1	3203	1
2918		3204

Diff Legend

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